Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ophélie Gagnard
slapos
Commits
b7cccaae
Commit
b7cccaae
authored
10 years ago
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'erp5' into erp5-cluster
parents
2add6e19
c9694c5b
No related merge requests found
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
13 deletions
+22
-13
component/groonga/buildout.cfg
component/groonga/buildout.cfg
+2
-2
component/gtkmm/buildout.cfg
component/gtkmm/buildout.cfg
+1
-0
component/mariadb/buildout.cfg
component/mariadb/buildout.cfg
+2
-2
component/poppler/buildout.cfg
component/poppler/buildout.cfg
+5
-3
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+12
-6
No files found.
component/groonga/buildout.cfg
View file @
b7cccaae
...
...
@@ -11,9 +11,9 @@ extends =
[groonga]
recipe = slapos.recipe.cmmi
version = 3.1.
1
version = 3.1.
2
url = http://packages.groonga.org/source/groonga/groonga-${:version}.tar.gz
md5sum =
c8bae890be05b4226f095839a049823e
md5sum =
fdd39d0c5bd647fb1a42e65f9d389081
configure-options =
--disable-static
--disable-glibtest
...
...
This diff is collapsed.
Click to expand it.
component/gtkmm/buildout.cfg
View file @
b7cccaae
...
...
@@ -3,6 +3,7 @@ extends =
../bzip2/buildout.cfg
../fontconfig/buildout.cfg
../freetype/buildout.cfg
../glibmm/buildout.cfg
../gtk-2/buildout.cfg
../libpng/buildout.cfg
../libxml2/buildout.cfg
...
...
This diff is collapsed.
Click to expand it.
component/mariadb/buildout.cfg
View file @
b7cccaae
...
...
@@ -63,8 +63,8 @@ environment =
# mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
# http://mroonga.github.com/
recipe = slapos.recipe.cmmi
url = http://packages.groonga.org/source/mroonga/mroonga-3.1
1
.tar.gz
md5sum =
3adfc67972b219586d0fdef9da25bc55
url = http://packages.groonga.org/source/mroonga/mroonga-3.1
2
.tar.gz
md5sum =
45d98789035dd9f00ad7cdc74098e190
configure-options =
--with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
--with-mysql-config=${mariadb:location}/bin/mysql_config
...
...
This diff is collapsed.
Click to expand it.
component/poppler/buildout.cfg
View file @
b7cccaae
...
...
@@ -10,12 +10,13 @@ extends =
../libtiff/buildout.cfg
../libxml2/buildout.cfg
../pkgconfig/buildout.cfg
../xz-utils/buildout.cfg
../zlib/buildout.cfg
[poppler]
recipe = slapos.recipe.cmmi
url = http://poppler.freedesktop.org/poppler-0.2
2.5.tar.g
z
md5sum =
1cd27460f7e3379d1eb109cfd7bcdb3
9
url = http://poppler.freedesktop.org/poppler-0.2
4.5.tar.x
z
md5sum =
334f2ac95cc8039f2a57fe63e4a81c6
9
depends =
${libtiff:version}
${libpng:so_version}
...
...
@@ -28,10 +29,11 @@ configure-options =
--disable-poppler-cpp
--disable-poppler-glib
--disable-poppler-qt4
--disable-poppler-qt5
--disable-static
--enable-zlib
environment =
PATH=${pkgconfig:location}/bin:%(PATH)s
PATH=${pkgconfig:location}/bin:
${xz-utils:location}/bin:
%(PATH)s
PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${libpng:location}/lib/pkgconfig
CPPFLAGS=-I${bzip2:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libtiff:location}/include -I${zlib:location}/include
LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
This diff is collapsed.
Click to expand it.
stack/erp5/buildout.cfg
View file @
b7cccaae
...
...
@@ -606,10 +606,13 @@ PasteDeploy = 1.5.2
Pygments = 1.6
argparse = 1.2.1
coverage = 3.7.1
lxml = 3.
2.5
lxml = 3.
3.0
mr.developer = 1.27
setuptools = 2.1
# huBarcode 1.0.0 has an issue with importing PIL.
huBarcode = 0.63
# Known version with works
numpy = 1.6.2
...
...
@@ -632,6 +635,9 @@ rdiff-backup = 1.0.5
# use newest version of slapos.cookbook
slapos.cookbook =
# we need to define an explicit version of slapos.core that is propagated to instances
slapos.core = 1.0.2.1
# modified version that works fine for buildout installation
SOAPpy = 0.12.0nxd001
...
...
@@ -666,15 +672,16 @@ Products.MimetypesRegistry = 2.0.5
Products.PluginRegistry = 1.3
Products.TIDStorage = 5.4.9
Products.ZSQLMethods = 2.13.4
PyPDF2 = 1.
19
PyPDF2 = 1.
20
StructuredText = 2.11.1
WSGIUtils = 0.7
Werkzeug = 0.9.4
apache-libcloud = 0.1
3.3
apache-libcloud = 0.1
4.0
async = 0.6.1
atomize = 0.1.1
cElementTree = 1.0.5-20051216
chardet = 2.2.1
cliff = 1.5.2
csp-eventlet = 0.7.0
elementtree = 1.2.7-20070827-preview
erp5.recipe.cmmiforcei686 = 0.1.3
...
...
@@ -689,7 +696,6 @@ gitdb = 0.5.4
greenlet = 0.4.2
hexagonit.recipe.cmmi = 2.0
http-parser = 0.8.3
huBarcode = 0.63
inotifyx = 0.2.0
ipdb = 0.8
ipython = 1.1.0
...
...
@@ -706,16 +712,16 @@ pyflakes = 0.7.3
python-ldap = 2.4.13
python-magic = 0.4.6
qrcode = 4.0.4
requests = 2.2.
0
requests = 2.2.
1
restkit = 4.2.2
rtjp-eventlet = 0.3.2
slapos.core = 1.0.2.1
slapos.recipe.build = 0.12
slapos.recipe.template = 2.5
slapos.toolbox = 0.38.1
smmap = 0.8.2
socketpool = 0.5.3
spyne = 2.10.9
stevedore = 0.14.1
supervisor = 3.0
threadframe = 0.2
timerserver = 2.0.2
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment