cleanup.

134cdcb2 · Kazuhiko Shiozaki · 6d5a86ee · 134cdcb2 · 134cdcb2 · 134cdcb2
Commit 134cdcb2 authored Oct 16, 2015 by Kazuhiko Shiozaki
14 changed files
--- a/component/6tunnel/buildout.cfg
+++ b/component/6tunnel/buildout.cfg
@@ -11,13 +11,10 @@ extends =
 recipe = slapos.recipe.cmmi
 url = http://toxygen.net/6tunnel/6tunnel-0.11rc2.tar.gz
 md5sum = 74e02d4f0704b3083a01feda66033449
-configure-command =
+pre-configure =
  aclocal
  autoheader
  automake --foreign
  autoconf
-  ./configure
-configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
 environment =
  PATH=${autoconf:location}/bin:${automake:location}/bin:%(PATH)s
--- a/component/apache/buildout.cfg
+++ b/component/apache/buildout.cfg
@@ -33,9 +33,10 @@ recipe = slapos.recipe.cmmi
 version = 2.4.16
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
 md5sum = 2b19cd338fd526dd5a63c57b1e9bfee2
-configure-command = cp -ar ${apr:location}/apr-${apr:version} srclib/apr/; cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util; ./configure
+pre-configure =
-configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  cp -ar ${apr:location}/apr-${apr:version} srclib/apr/ &&
-                    --disable-static
+  cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util
+configure-options = --disable-static
                    --enable-authn-alias
                    --enable-bucketeer
                    --enable-cache

--- a/component/aspell/buildout.cfg
+++ b/component/aspell/buildout.cfg
@@ -7,12 +7,9 @@ extends =
  ../ncurses/buildout.cfg
  ../perl/buildout.cfg
-[aspell-common-dictionary]
+[aspell-dictionary-common]
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+recipe = slapos.recipe.cmmi
-recipe = plone.recipe.command
+configure-command = ./configure --vars ASPELL=${aspell:location}/bin/aspell PREZIP=${aspell:location}/bin/prezip-bin
-command = mkdir -p ${:location}
-update-command = ${:command}
-stop-on-error = yes
 [aspell]
 recipe = slapos.recipe.cmmi
@@ -24,7 +21,6 @@ environment =
  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
 [aspell-en-dictionary]
-recipe = slapos.recipe.cmmi
+<= aspell-dictionary-common
 url = ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-7.1-0.tar.bz2
 md5sum = beba5e8f3afd3ed1644653bb685b2dfb
-configure-command = ./configure --vars ASPELL=${aspell:location}/bin/aspell PREZIP=${aspell:location}/bin/prezip-bin
--- a/component/coreutils/buildout.cfg
+++ b/component/coreutils/buildout.cfg
@@ -10,7 +10,7 @@ recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.23.tar.xz
 md5sum = abed135279f87ad6762ce57ff6d89c41
 configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --enable-install-program=tr,basename,uname,cat,cp,ls
+  -enable-install-program=tr,basename,uname,cat,cp,ls
 environment =
  PATH=${xz-utils:location}/bin:%(PATH)s
  LDFLAGS=-Wl,--as-needed -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib

--- a/component/cyrus-sasl/buildout.cfg
+++ b/component/cyrus-sasl/buildout.cfg
@@ -14,13 +14,11 @@ recipe = slapos.recipe.cmmi
 url = ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
 md5sum = a7f4e5e559a0e37b3ffc438c9456e425
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-configure-command =
+pre-configure =
  "${libtool:location}/bin/libtoolize" -c -f &&
  "${automake:location}/bin/aclocal" -I "${libtool:location}/share/aclocal" -I config -I cmulocal &&
-  "${automake:location}/bin/automake" -c -a -f &&
+  "${automake:location}/bin/automake" -c -a -f
-  ./configure
 configure-options =
-  --prefix=${:location}
  --disable-digest
  --disable-gssapi
  --disable-otp

--- a/component/dropbear/buildout.cfg
+++ b/component/dropbear/buildout.cfg
@@ -20,7 +20,6 @@ md5sum = 0284ea239083f04c8b874e08e1aca243
 url = http://matt.ucc.asn.au/dropbear/releases/dropbear-0.53.1.tar.bz2
 configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
  --with-zlib=${zlib:location}
  CFLAGS="-DENABLE_SINGLEUSER -D__DIRTY_NO_SHELL_CHECKING"

--- a/component/jasper/buildout.cfg
+++ b/component/jasper/buildout.cfg
@@ -16,9 +16,10 @@ patches =
  ${:_profile_base_location_}/CVE-2014-9029.patch#d69195cf17878f024cc0b580045ec314
  ${:_profile_base_location_}/CVE-2014-8137.patch#bc5103b9a33315538106bf6652383a10
  ${:_profile_base_location_}/CVE-2014-8138.patch#bfb9604fe84b6e686fea29bd760cf34d
-# jasper configure script is not executable by default
+configure-options =
-configure-command =
+  --disable-static
-  /bin/sh ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static --enable-shared --disable-opengl
+  --enable-shared
+  --disable-opengl
 environment =
  CPPFLAGS=-I${libjpeg:location}/include
  LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib
--- a/component/leptonica/buildout.cfg
+++ b/component/leptonica/buildout.cfg
 [buildout]
 parts = leptonica
 extends =
-  ../libtool/buildout.cfg
  ../zlib/buildout.cfg
  ../libjpeg/buildout.cfg
  ../libpng/buildout.cfg
@@ -13,13 +12,11 @@ extends =
 recipe = slapos.recipe.cmmi
 url = http://leptonica.googlecode.com/files/leptonica-1.68.tar.gz
 md5sum = 5cd7092f9ff2ca7e3f3e73bfcd556403
-configure-command =
+configure-options =
-  ./autogen.sh
+  --disable-static
-  ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static
 patch-options = -p1
 patches =
  ${:_profile_base_location_}/leptonica-1.69-zlib-include.patch#cff3dc942075190939b407c38e0d3201
 environment =
-  ACLOCAL_ARGS=-I${libtool:location}/share/aclocal
  CPPFLAGS=-I${zlib:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libtiff:location}/include -I${webp:location}/include -I${giflib:location}/include
  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib -L${giflib:location}/lib -Wl,-rpath=${giflib:location}/lib
--- a/component/mariadb/buildout.cfg
+++ b/component/mariadb/buildout.cfg
@@ -59,9 +59,10 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://packages.groonga.org/source/mroonga/mroonga-5.08.tar.gz
 md5sum = 65011c1da8700c4950d11dea7355b32d
-configure-command = mkdir fake_mariadb_source && ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql && ./configure
+pre-configure =
+  mkdir fake_mariadb_source &&
+  ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql
 configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
  --with-mysql-source=fake_mariadb_source
  --with-mysql-config=${mariadb:location}/bin/mysql_config
  --disable-static

--- a/component/pkgconfig/buildout.cfg
+++ b/component/pkgconfig/buildout.cfg
@@ -19,10 +19,9 @@ md5sum = 77f27dce7ef88d0634d0d6f90e03a77f
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 # build pkg-config twice so that second configure can use pkg-config
 # to compute GLIB_CFLAGS and GLIB_LIBS.
-configure-command =
+pre-configure =
-  ./configure --prefix=${:location} --with-installed-glib --with-installed-popt && make && ./configure
+  ./configure --prefix=${:location} --with-installed-glib --with-installed-popt && make
 configure-options =
-  --prefix=${:location}
  --with-installed-glib
  --with-installed-popt
  --disable-host-tool

--- a/component/tesseract/buildout.cfg
+++ b/component/tesseract/buildout.cfg
@@ -20,13 +20,15 @@ patch-options =
 patches =
  ${:_profile_base_location_}/tesseract-3.00-gcc-4.7-build.patch#ca80db3ec489c547b03f3ee48879c1b1
  ${:_profile_base_location_}/tesseract-3.01-remove-bom.patch#2e691858cb492b7c17d23bf0912b3d24
-configure-command =
+pre-configure =
  libtoolize -f -c
  aclocal -I ${libtool:location}/share/aclocal -I config
  autoheader -f
  automake -c -a -f
  autoconf -Wno-portability
-  ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static --datarootdir=${tesseract-eng-traineddata:location}
+configure-options =
+  --disable-static
+  --datarootdir=${tesseract-eng-traineddata:location}
 # XXX: tesseract seems not easily configurable at runtime about where to find
 # its trained data, so we set its datarootdir above to a controlled location

--- a/component/trafficserver/buildout.cfg
+++ b/component/trafficserver/buildout.cfg
 [buildout]
 extends =
  ../../component/lua/buildout.cfg
-  ../../component/hwloc/buildout.cfg
  ../../component/pkgconfig/buildout.cfg
  ../../component/libtool/buildout.cfg
  ../../component/make/buildout.cfg
@@ -23,7 +22,6 @@ recipe = slapos.recipe.cmmi
 url = http://apache.claz.org/trafficserver/trafficserver-4.2.3.tar.bz2
 md5sum = 1d06a6e9063ceea3f19dbb84752ec710
 configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
  --with-openssl=${openssl:location}
  --with-xml=libxml2
  --with-libxml2=${libxml2:location}

--- a/software/slaprunner/software.cfg
+++ b/software/slaprunner/software.cfg
@@ -16,7 +16,6 @@ ecdsa = 0.13
 erp5.util = 0.4.43
 gitdb = 0.6.4
 gunicorn = 19.3.0
-plone.recipe.command = 1.1
 prettytable = 0.7.2
 pycrypto = 2.6.1
 slapos.recipe.template = 2.8

--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -674,7 +674,6 @@ ipython = 4.0.0
 logilab-common = 1.1.0
 numpy = 1.10.1
 objgraph = 2.0.1
-plone.recipe.command = 1.1
 ply = 3.8
 polib = 1.0.7
 pprofile = 1.7.3
@@ -704,11 +703,6 @@ xupdate-processor = 0.4
 # Products.CMFCore==2.2.9
 Products.ZSQLMethods = 2.13.4
-# Required by:
-# ipython==4.0.0
-# traitlets==4.0.0
-decorator = 4.0.4
 # Required by:
 # SOAPpy===0.12.0nxd001
 fpconst = 0.7.2