Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos-caddy
Commits
71ed0078
Commit
71ed0078
authored
Feb 21, 2013
by
Sebastien Robin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pdftk removed from erp5
parent
408f595b
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
1 addition
and
70 deletions
+1
-70
component/gcc/buildout.cfg
component/gcc/buildout.cfg
+1
-60
software/cloudooo/instance-cloudoo.cfg.in
software/cloudooo/instance-cloudoo.cfg.in
+0
-1
software/cloudooo/instance.cfg.in
software/cloudooo/instance.cfg.in
+0
-1
software/cloudooo/software.cfg
software/cloudooo/software.cfg
+0
-1
stack/cloudooo.cfg
stack/cloudooo.cfg
+0
-2
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+0
-2
stack/erp5/instance-zope.cfg.in
stack/erp5/instance-zope.cfg.in
+0
-1
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+0
-2
No files found.
component/gcc/buildout.cfg
View file @
71ed0078
...
@@ -55,13 +55,6 @@ environment =
...
@@ -55,13 +55,6 @@ environment =
PATH=${m4:location}/bin:%(PATH)s
PATH=${m4:location}/bin:%(PATH)s
LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${ppl:location}/lib
LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${ppl:location}/lib
[ecj]
recipe = hexagonit.recipe.download
download-only = true
url = ftp://sourceware.org/pub/java/ecj-4.5.jar
md5sum = d7cd6a27c8801e66cbaa964a039ecfdb
filename = ecj.jar
[gcc-download]
[gcc-download]
hack-revision = ${gcc-interconnection-workaround:hack-revision}
hack-revision = ${gcc-interconnection-workaround:hack-revision}
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
...
@@ -70,15 +63,6 @@ md5sum = 8e0b5c12212e185f3e4383106bfa9cc6
...
@@ -70,15 +63,6 @@ md5sum = 8e0b5c12212e185f3e4383106bfa9cc6
strip-top-level-dir = True
strip-top-level-dir = True
destination = ${gcc-source:location}
destination = ${gcc-source:location}
[gcc-java-download]
hack-revision = ${gcc-interconnection-workaround:hack-revision}
recipe = hexagonit.recipe.download
url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.3/gcc-java-4.5.3.tar.bz2
md5sum = 08e045fdbdc22ac9af3aec3b8d16dbab
strip-top-level-dir = True
destination = ${gcc-source:location}
ignore-existing = true
[gcc-source]
[gcc-source]
hack-revision = ${gcc-interconnection-workaround:hack-revision}
hack-revision = ${gcc-interconnection-workaround:hack-revision}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
...
@@ -90,53 +74,10 @@ url = ${:_profile_base_location_}/${:filename}
...
@@ -90,53 +74,10 @@ url = ${:_profile_base_location_}/${:filename}
filename = ${:_buildout_section_name_}
filename = ${:_buildout_section_name_}
download-only = true
download-only = true
[gcc-java-pre-4.4.patch]
recipe = hexagonit.recipe.download
md5sum = 9a563576126d9fcf234ef29c2fc7df76
url = ${:_profile_base_location_}/${:filename}
filename = ${:_buildout_section_name_}
download-only = true
[gcc-java-minimal]
hack-revision = ${gcc-interconnection-workaround:hack-revision}
depends =
${gcc-download:location}
${gcc-java-download:location}
recipe = hexagonit.recipe.cmmi
path = ${gcc-source:location}
md5sum = bb3265edf0fa7543e50cedb93e04e427
patches =
${gcc-multiarch.patch:location}/${gcc-multiarch.patch:filename}
${gcc-java-pre-4.4.patch:location}/${gcc-java-pre-4.4.patch:filename}
patch-options = -p2
configure-command = make clean \\; make distclean \\; ./configure
# GMP does not correctly detect achitecture so it have to be given
# as hexagonit.recipe.cmmi is using shell expansion in subproceses
# backticks are working
configure-options =
--disable-bootstrap
--enable-languages=java
--disable-multilib
--with-gmp=${gmp:location}
--with-mpfr=${mpfr:location}
--with-mpc=${mpc:location}
--with-ecj-jar=${ecj:location}/${ecj:filename}
--prefix=${buildout:parts-directory}/${:_buildout_section_name_}
--without-ppl
--without-cloog
environment =
CPPFLAGS =-I${mpfr:location}/include -I${gmp:location}/include -I${mpc:location}/include
LDFLAGS =-L${mpfr:location}/lib -Wl,-rpath=${mpfr:location}/lib -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpc:location}/lib
PATH=${zip:location}/bin:%(PATH)s
# make install does not work when several core are used
make-targets = install -j1
[gcc]
[gcc]
hack-revision = ${gcc-interconnection-workaround:hack-revision}
hack-revision = ${gcc-interconnection-workaround:hack-revision}
depends =
depends =
${gcc-download:location}
${gcc-download:location}
${gcc-java-download:location}
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
path = ${gcc-source:location}
path = ${gcc-source:location}
md5sum = bb3265edf0fa7543e50cedb93e04e427
md5sum = bb3265edf0fa7543e50cedb93e04e427
...
@@ -149,7 +90,7 @@ configure-command = make clean \\; make distclean \\; ./configure
...
@@ -149,7 +90,7 @@ configure-command = make clean \\; make distclean \\; ./configure
# backticks are working
# backticks are working
configure-options =
configure-options =
--disable-bootstrap
--disable-bootstrap
--enable-languages="c,c++
,java
"
--enable-languages="c,c++"
--disable-multilib
--disable-multilib
--with-gmp=${gmp:location}
--with-gmp=${gmp:location}
--with-mpfr=${mpfr:location}
--with-mpfr=${mpfr:location}
...
...
software/cloudooo/instance-cloudoo.cfg.in
View file @
71ed0078
...
@@ -76,7 +76,6 @@ link-binary =
...
@@ -76,7 +76,6 @@ link-binary =
{{ parameter_dict['poppler'] }}/bin/pdfinfo
{{ parameter_dict['poppler'] }}/bin/pdfinfo
{{ parameter_dict['poppler'] }}/bin/pdftotext
{{ parameter_dict['poppler'] }}/bin/pdftotext
{{ parameter_dict['poppler'] }}/bin/pdftohtml
{{ parameter_dict['poppler'] }}/bin/pdftohtml
{{ parameter_dict['pdftk'] }}/bin/pdftk
# rest of parts are candidates for some generic stuff
# rest of parts are candidates for some generic stuff
[basedirectory]
[basedirectory]
...
...
software/cloudooo/instance.cfg.in
View file @
71ed0078
...
@@ -34,7 +34,6 @@ fonts = {{ fonts_location }}
...
@@ -34,7 +34,6 @@ fonts = {{ fonts_location }}
coreutils = {{ coreutils_location }}
coreutils = {{ coreutils_location }}
imagemagick = {{ imagemagick_location }}
imagemagick = {{ imagemagick_location }}
poppler = {{ poppler_location }}
poppler = {{ poppler_location }}
pdftk = {{ pdftk_location }}
buildout-bin-directory = {{ buildout_bin_directory }}
buildout-bin-directory = {{ buildout_bin_directory }}
[dynamic-template-cloudooo]
[dynamic-template-cloudooo]
...
...
software/cloudooo/software.cfg
View file @
71ed0078
...
@@ -90,7 +90,6 @@ extra-context =
...
@@ -90,7 +90,6 @@ extra-context =
key libreoffice_bin_location libreoffice-bin:location
key libreoffice_bin_location libreoffice-bin:location
key libxcb_location libxcb:location
key libxcb_location libxcb:location
key openssl_location openssl:location
key openssl_location openssl:location
key pdftk_location pdftk:location
key poppler_location poppler:location
key poppler_location poppler:location
key template_cloudooo template-cloudooo:target
key template_cloudooo template-cloudooo:target
key zlib_location zlib:location
key zlib_location zlib:location
...
...
stack/cloudooo.cfg
View file @
71ed0078
...
@@ -43,7 +43,6 @@ extends =
...
@@ -43,7 +43,6 @@ extends =
../component/git/buildout.cfg
../component/git/buildout.cfg
../component/poppler/buildout.cfg
../component/poppler/buildout.cfg
../component/imagemagick/buildout.cfg
../component/imagemagick/buildout.cfg
../component/pdftk/buildout.cfg
../component/ffmpeg/buildout.cfg
../component/ffmpeg/buildout.cfg
../component/file/buildout.cfg
../component/file/buildout.cfg
../component/stunnel/buildout.cfg
../component/stunnel/buildout.cfg
...
@@ -76,7 +75,6 @@ parts =
...
@@ -76,7 +75,6 @@ parts =
imagemagick
imagemagick
file
file
poppler
poppler
pdftk
ffmpeg
ffmpeg
bootstrap2.6
bootstrap2.6
...
...
stack/erp5/buildout.cfg
View file @
71ed0078
...
@@ -40,7 +40,6 @@ extends =
...
@@ -40,7 +40,6 @@ extends =
../../component/mariadb/buildout.cfg
../../component/mariadb/buildout.cfg
../../component/memcached/buildout.cfg
../../component/memcached/buildout.cfg
../../component/mysql-python/buildout.cfg
../../component/mysql-python/buildout.cfg
../../component/pdftk/buildout.cfg
../../component/pil-python/buildout.cfg
../../component/pil-python/buildout.cfg
../../component/pycrypto-python/buildout.cfg
../../component/pycrypto-python/buildout.cfg
../../component/pysvn-python/buildout.cfg
../../component/pysvn-python/buildout.cfg
...
@@ -95,7 +94,6 @@ parts =
...
@@ -95,7 +94,6 @@ parts =
perl-DBI
perl-DBI
percona-toolkit
percona-toolkit
zabbix-agent
zabbix-agent
pdftk
dcron
dcron
dash
dash
wget
wget
...
...
stack/erp5/instance-zope.cfg.in
View file @
71ed0078
...
@@ -196,7 +196,6 @@ link-binary =
...
@@ -196,7 +196,6 @@ link-binary =
{{ librsvg_location }}/bin/rsvg-convert
{{ librsvg_location }}/bin/rsvg-convert
{{ mariadb_location }}/bin/mysql
{{ mariadb_location }}/bin/mysql
{{ mariadb_location }}/bin/mysqldump
{{ mariadb_location }}/bin/mysqldump
{{ pdftk_location }}/bin/pdftk
{{ sed_location }}/bin/sed
{{ sed_location }}/bin/sed
{{ tesseract_location }}/bin/tesseract
{{ tesseract_location }}/bin/tesseract
{{ w3m_location }}/bin/w3m
{{ w3m_location }}/bin/w3m
...
...
stack/erp5/instance.cfg.in
View file @
71ed0078
...
@@ -129,7 +129,6 @@ librsvg = {{ librsvg_location }}
...
@@ -129,7 +129,6 @@ librsvg = {{ librsvg_location }}
logrotate = {{ logrotate_location }}
logrotate = {{ logrotate_location }}
mariadb = {{ mariadb_location }}
mariadb = {{ mariadb_location }}
openssl = {{ openssl_location }}
openssl = {{ openssl_location }}
pdftk = {{ pdftk_location }}
poppler = {{ poppler_location }}
poppler = {{ poppler_location }}
sed = {{ sed_location }}
sed = {{ sed_location }}
tesseract = {{ tesseract_location }}
tesseract = {{ tesseract_location }}
...
@@ -159,7 +158,6 @@ extra-context =
...
@@ -159,7 +158,6 @@ extra-context =
key logrotate_location dynamic-template-zope-parameters:logrotate
key logrotate_location dynamic-template-zope-parameters:logrotate
key mariadb_location dynamic-template-zope-parameters:mariadb
key mariadb_location dynamic-template-zope-parameters:mariadb
key openssl_location dynamic-template-zope-parameters:openssl
key openssl_location dynamic-template-zope-parameters:openssl
key pdftk_location dynamic-template-zope-parameters:pdftk
key poppler_location dynamic-template-zope-parameters:poppler
key poppler_location dynamic-template-zope-parameters:poppler
key sed_location dynamic-template-zope-parameters:sed
key sed_location dynamic-template-zope-parameters:sed
key tesseract_location dynamic-template-zope-parameters:tesseract
key tesseract_location dynamic-template-zope-parameters:tesseract
...
...
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