use our own perl in buidling components.

49f934ce · Kazuhiko Shiozaki · 81c492a7 · 49f934ce · 49f934ce · 49f934ce
Commit 49f934ce authored May 09, 2014 by Kazuhiko Shiozaki
18 changed files
--- a/component/apache/buildout.cfg
+++ b/component/apache/buildout.cfg
@@ -9,6 +9,7 @@ extends =
  ../gdbm/buildout.cfg
  ../openssl/buildout.cfg
  ../pcre/buildout.cfg
+  ../perl/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../sqlite3/buildout.cfg
  ../zlib/buildout.cfg
@@ -85,7 +86,7 @@ configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_na
                    --without-iconv

 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
  CPPFLAGS =-I${libuuid:location}/include -I${openssl:location}/include
  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib
@@ -166,7 +167,7 @@ configure-options = --disable-static
                    --without-iconv

 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
  CPPFLAGS =-I${libuuid:location}/include
  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib

--- a/component/aspell/buildout.cfg
+++ b/component/aspell/buildout.cfg
@@ -5,6 +5,7 @@ parts =

 extends =
  ../ncurses/buildout.cfg
+  ../perl/buildout.cfg

 [aspell-common-dictionary]
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -19,6 +20,7 @@ revision = 1
 url = http://ftp.gnu.org/gnu/aspell/aspell-0.60.6.1.tar.gz
 md5sum = e66a9c9af6a60dc46134fdacf6ce97d7
 environment =
+  PATH=${perl:location}/bin:%(PATH)s
  CPPFLAGS=-I${ncurses:location}/include
  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib


--- a/component/cups/buildout.cfg
+++ b/component/cups/buildout.cfg
 [buildout]
-extends =
-  ../zlib/buildout.cfg
 parts =
  cups

+extends =
+  ../perl/buildout.cfg
+  ../zlib/buildout.cfg
+
 # for now we build and install library and header files only.
 [cups]
 recipe = slapos.recipe.cmmi
@@ -28,5 +30,6 @@ make-targets =
  install-headers
  install-libs
 environment =
+  PATH=${perl:location}/bin:%(PATH)s
  CPPFLAGS=-I${zlib:location}/include
  DSOFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/curl/buildout.cfg
+++ b/component/curl/buildout.cfg
@@ -4,6 +4,7 @@
 [buildout]
 extends =
  ../openssl/buildout.cfg
+  ../perl/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../zlib/buildout.cfg
 parts =
@@ -39,6 +40,6 @@ configure-options =
  --without-nghttp2

 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
  LDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib
--- a/component/gettext/buildout.cfg
+++ b/component/gettext/buildout.cfg
@@ -4,6 +4,7 @@ parts =
 extends =
  ../ncurses/buildout.cfg
  ../libxml2/buildout.cfg
+  ../perl/buildout.cfg
  ../zlib/buildout.cfg

 [gettext]
@@ -27,5 +28,6 @@ configure-options =
  --without-xz

 environment =
+  PATH=${perl:location}/bin:%(PATH)s
  CPPFLAGS=-I${libxml2:location}/include -I${zlib:location}/include -I${ncurses:location}/include
  LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
--- a/component/glib/buildout.cfg
+++ b/component/glib/buildout.cfg
@@ -2,6 +2,7 @@
 extends =
  ../gettext/buildout.cfg
  ../libffi/buildout.cfg
+  ../perl/buildout.cfg
  ../xz-utils/buildout.cfg
  ../zlib/buildout.cfg
 parts =
@@ -18,7 +19,7 @@ configure-options =
  --disable-xattr
  --disable-man
 environment =
-  PATH=${gettext:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${gettext:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
  CPPFLAGS=-I${gettext:location}/include -I${zlib:location}/include
  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
  LIBFFI_CFLAGS=-I${libffi:location}/lib/libffi-${libffi:version}/include

--- a/component/glibmm/buildout.cfg
+++ b/component/glibmm/buildout.cfg
@@ -3,6 +3,7 @@ extends =
  ../gettext/buildout.cfg
  ../glib/buildout.cfg
  ../libsigc/buildout.cfg
+  ../perl/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../xz-utils/buildout.cfg
 parts =
@@ -16,7 +17,7 @@ pkg_config_depends = ${glib:location}/lib/pkgconfig:${libsigc:location}/lib/pkgc
 configure-options =
  --disable-documentation
 environment =
-  PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${:pkg_config_depends}
  CPPFLAGS=-I${gettext:location}/include
  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
--- a/component/groff/buildout.cfg
+++ b/component/groff/buildout.cfg
@@ -2,6 +2,9 @@
 parts =
  groff

+extends =
+  ../perl/buildout.cfg
+
 [groff]
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/groff/groff-1.21.tar.gz
@@ -9,3 +12,5 @@ md5sum = 8b8cd29385b97616a0f0d96d0951c5bf
 configure-options =
  --disable-static
  --without-x
+environment =
+  PATH=${perl:location}/bin:%(PATH)s
--- a/component/gtk-2/buildout.cfg
+++ b/component/gtk-2/buildout.cfg
@@ -9,6 +9,7 @@ extends =
  ../libpng/buildout.cfg
  ../libtiff/buildout.cfg
  ../libxml2/buildout.cfg
+  ../perl/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../xorg/buildout.cfg
  ../xz-utils/buildout.cfg
@@ -80,7 +81,7 @@ configure-options =
  --without-libintl-prefix
  --with-x11
 environment =
-  PATH=${glib:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${glib:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${:pkg_config_depends}
  CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include
  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
@@ -112,7 +113,7 @@ configure-options =
  --disable-xinerama
  --disable-gtk-doc-html
 environment =
-  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${:pkg_config_depends}
 # not taken from pkg-config result...
  CPPFLAGS=-I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include -I${libXext:location}/include

--- a/component/gtkmm/buildout.cfg
+++ b/component/gtkmm/buildout.cfg
@@ -7,6 +7,7 @@ extends =
  ../gtk-2/buildout.cfg
  ../libpng/buildout.cfg
  ../libxml2/buildout.cfg
+  ../perl/buildout.cfg
  ../xorg/buildout.cfg
  ../xz-utils/buildout.cfg
  ../zlib/buildout.cfg
@@ -24,7 +25,7 @@ configure-options =
  --disable-static
  --disable-documentation
 environment =
-  PATH=${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${freetype:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${:pkg_config_depends}
  CPPFLAGS=-I${libX11:location}/include -I${libXrender:location}/include -I${render:location}/include -I${xproto:location}/include
  LDFLAGS=-L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
@@ -38,7 +39,7 @@ configure-options =
  --disable-static
  --disable-documentation
 environment =
-  PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${glib:location}/bin:${freetype:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${:pkg_config_depends}
  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib

@@ -51,7 +52,7 @@ configure-options =
  --disable-static
  --disable-documentation
 environment =
-  PATH=${glib:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${glib:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${:pkg_config_depends}
  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib

@@ -64,6 +65,6 @@ configure-options =
  --disable-static
  --disable-documentation
 environment =
-  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${gtk-2:location}/bin:${pango:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${gtk-2:location}/bin:${pango:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${:pkg_config_depends}
  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/libsigc/buildout.cfg
+++ b/component/libsigc/buildout.cfg
 [buildout]
 extends =
  ../m4/buildout.cfg
+  ../perl/buildout.cfg
  ../xz-utils/buildout.cfg

 parts =
@@ -13,4 +14,4 @@ md5sum = 06a0569e8ba161d3428e7daa838682f8
 configure-options =
  --disable-documentation
 environment =
-  PATH=${m4:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${m4:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
--- a/component/libuuid/buildout.cfg
+++ b/component/libuuid/buildout.cfg
@@ -2,6 +2,9 @@
 parts =
  libuuid

+extenrs =
+  ../perl/buildout.cfg
+
 [libuuid]
 recipe = slapos.recipe.cmmi
 url = http://www.kernel.org/pub/linux/utils/util-linux/v2.18/util-linux-ng-2.18.tar.bz2
@@ -38,3 +41,5 @@ configure-options =

 make-options =
  -C shlibs/uuid
+environment =
+  PATH=${perl:location}/bin:%(PATH)s
--- a/component/libxml2/buildout.cfg
+++ b/component/libxml2/buildout.cfg
@@ -2,7 +2,10 @@
 # http://xmlsoft.org/

 [buildout]
-extends = ../zlib/buildout.cfg
+extends =
+  ../perl/buildout.cfg
+  ../zlib/buildout.cfg
+
 parts =
  libxml2

@@ -16,4 +19,5 @@ configure-options =
  --without-lzma
  --with-zlib=${zlib:location}
 environment =
-    LDFLAGS = -Wl,-rpath=${zlib:location}/lib
+  PATH=${perl:location}/bin:%(PATH)s
+  LDFLAGS=-Wl,-rpath=${zlib:location}/lib
--- a/component/opensp/buildout.cfg
+++ b/component/opensp/buildout.cfg
 [buildout]
+parts =
+  opensp
+
+extends =
+  ../perl/buildout.cfg
+
 [opensp]
 recipe = slapos.recipe.cmmi
 url = http://prdownloads.sourceforge.net/openjade/OpenSP-1.5.2.tar.gz
@@ -6,3 +12,5 @@ md5sum = 670b223c5d12cee40c9137be86b6c39b
 configure-options =
  --disable-static
  --disable-doc-build
+environment =
+  PATH=${perl:location}/bin:%(PATH)s
--- a/component/openssl/buildout.cfg
+++ b/component/openssl/buildout.cfg
@@ -6,9 +6,10 @@
 [buildout]
 extends =
  ../ca-certificates/buildout.cfg
-  ../zlib/buildout.cfg
-  ../patch/buildout.cfg
  ../coreutils/buildout.cfg
+  ../patch/buildout.cfg
+  ../perl/buildout.cfg
+  ../zlib/buildout.cfg

 parts =
  openssl-output
@@ -40,6 +41,8 @@ make-options =
  -j1
 make-targets =
  all install_sw && rm -f ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/* && for i in ${ca-certificates:location}/certs/*/*.crt; do ln -sv $i ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/`${buildout:parts-directory}/${:_buildout_section_name_}/bin/openssl x509 -hash -noout -in $i`.0; done; true
+environment =
+  PERL=${perl:location}/bin/perl

 [openssl-output]
 # Shared binary location to ease migration

--- a/component/subversion/buildout.cfg
+++ b/component/subversion/buildout.cfg
@@ -7,6 +7,7 @@ extends =
  ../libexpat/buildout.cfg
  ../libuuid/buildout.cfg
  ../neon/buildout.cfg
+  ../perl/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../sqlite3/buildout.cfg
  ../zlib/buildout.cfg
@@ -49,7 +50,7 @@ make-options =
  -j1

 environment =
-  PATH=${pkgconfig:location}/bin:${neon:location}/bin:%(PATH)s
+  PATH=${perl:location}/bin:${pkgconfig:location}/bin:${neon:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${neon:location}/lib/pkgconfig
  CPPFLAGS=-I${libexpat:location}/include -I${libuuid:location}/include
  LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${neon:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib

--- a/component/w3m/buildout.cfg
+++ b/component/w3m/buildout.cfg
@@ -3,6 +3,7 @@ extends =
  ../garbage-collector/buildout.cfg
  ../ncurses/buildout.cfg
  ../openssl/buildout.cfg
+  ../perl/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../zlib/buildout.cfg

@@ -37,7 +38,7 @@ patches =
  ${:_profile_base_location_}/w3m-0.5.2-gc72.patch#5a74b6379240c8dd1372efa7926c8bdc

 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkgconfig
  CPPFLAGS=-I${ncurses:location}/include/ -I${zlib:location}/include/ -I${garbage-collector:location}/include
  LDFLAGS=-Wl,--as-needed -L${garbage-collector:location}/lib -Wl,-rpath=${garbage-collector:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/xorg/buildout.cfg
+++ b/component/xorg/buildout.cfg
 [buildout]
 extends =
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../bzip2/buildout.cfg
+  ../dash/buildout.cfg
  ../freetype/buildout.cfg
+  ../gnutls/buildout.cfg
  ../intltool/buildout.cfg
+  ../libtool/buildout.cfg
  ../libuuid/buildout.cfg
  ../libxml2/buildout.cfg
  ../libxslt/buildout.cfg
+  ../openssl/buildout.cfg
+  ../perl/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../zlib/buildout.cfg
-  ../bzip2/buildout.cfg
-  ../openssl/buildout.cfg
-  ../gnutls/buildout.cfg
-  ../autoconf/buildout.cfg
-  ../automake/buildout.cfg
-  ../libtool/buildout.cfg
-  ../dash/buildout.cfg

 parts =
  libXdmcp
@@ -155,7 +156,7 @@ configure-options =
  --without-xmlto
  --without-fop
 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${:pkg_config_depends}

 # Below is stuff for xserver
@@ -351,7 +352,7 @@ md5sum = a6f137ae100e74ebe3b71eb4a38c40b3
 configure-options =
  --disable-static
 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${libSM:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libICE:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig

 [dri2proto]