From b009ec6cf4bbe38a738d631b8e88833f54edccbc Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Mon, 13 Jun 2011 17:39:11 +0200 Subject: [PATCH] simplify "-Wl,-rpath -Wl,location" -> "-Wl,-rpath=location". --- component/apache/buildout.cfg | 2 +- component/curl/buildout.cfg | 2 +- component/cyrus-sasl/buildout.cfg | 2 +- component/fastjar/buildout.cfg | 2 +- component/ffmpeg/buildout.cfg | 4 ++-- component/file/buildout.cfg | 2 +- component/flare/buildout.cfg | 2 +- component/fontconfig/buildout.cfg | 2 +- component/freetype/buildout.cfg | 2 +- component/gcc/buildout.cfg | 6 +++--- component/gettext/buildout.cfg | 2 +- component/ghostscript/buildout.cfg | 2 +- component/git/buildout.cfg | 2 +- component/glib/buildout.cfg | 2 +- component/graphviz/buildout.cfg | 2 +- component/grep/buildout.cfg | 2 +- component/imagemagick/buildout.cfg | 2 +- component/jasper/buildout.cfg | 2 +- component/kumo/buildout.cfg | 2 +- component/libpng/buildout.cfg | 2 +- component/librsync/buildout.cfg | 2 +- component/libtiff/buildout.cfg | 2 +- component/libxml2/buildout.cfg | 2 +- component/libxslt/buildout.cfg | 2 +- component/logrotate/buildout.cfg | 2 +- component/mariadb/buildout.cfg | 2 +- component/memcached/buildout.cfg | 2 +- component/mysql-5.1/buildout.cfg | 2 +- component/mysql-tritonn-5.0/buildout.cfg | 2 +- component/neon/buildout.cfg | 2 +- component/openldap/buildout.cfg | 2 +- component/openssl/buildout.cfg | 4 ++-- component/pdftk/buildout.cfg | 2 +- component/perl-SGML-Parser-OpenSP/buildout.cfg | 2 +- component/perl-XML-LibXML/buildout.cfg | 2 +- component/perl/buildout.cfg | 2 +- component/pkgconfig/buildout.cfg | 2 +- component/poppler/buildout.cfg | 2 +- component/postfix/buildout.cfg | 2 +- component/python-2.4/buildout.cfg | 2 +- component/python-2.6/buildout.cfg | 2 +- component/python-2.7/buildout.cfg | 2 +- component/readline/buildout.cfg | 2 +- component/serf/buildout.cfg | 2 +- component/sphinx/buildout.cfg | 2 +- component/sqlite3/buildout.cfg | 2 +- component/stunnel/buildout.cfg | 2 +- component/subversion/buildout.cfg | 2 +- component/tesseract/buildout.cfg | 2 +- component/tokyocabinet/buildout.cfg | 2 +- component/varnish/buildout.cfg | 4 ++-- component/w3m/buildout.cfg | 2 +- component/xtrabackup/buildout.cfg | 2 +- 53 files changed, 58 insertions(+), 58 deletions(-) diff --git a/component/apache/buildout.cfg b/component/apache/buildout.cfg index aaead1018..c3c3668c3 100644 --- a/component/apache/buildout.cfg +++ b/component/apache/buildout.cfg @@ -67,7 +67,7 @@ environment = PATH=${pkgconfig:location}/bin:%(PATH)s PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig CPPFLAGS =-I${libuuid:location}/include - LDFLAGS =-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -Wl,-rpath -Wl,${libexpat:location}/lib -Wl,-rpath -Wl,${pcre:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -Wl,-rpath -Wl,${gdbm:location}/lib + 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 [apache-antiloris] # Note: Shall react on each build of apache and reinstall itself diff --git a/component/curl/buildout.cfg b/component/curl/buildout.cfg index e1ab35a9a..bdc1cd1d5 100644 --- a/component/curl/buildout.cfg +++ b/component/curl/buildout.cfg @@ -37,4 +37,4 @@ configure-options = environment = PATH=${pkgconfig:location}/bin:%(PATH)s PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig - LDFLAGS=-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib + LDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib diff --git a/component/cyrus-sasl/buildout.cfg b/component/cyrus-sasl/buildout.cfg index 5fff0a4cb..a8ea8e0c0 100644 --- a/component/cyrus-sasl/buildout.cfg +++ b/component/cyrus-sasl/buildout.cfg @@ -38,4 +38,4 @@ make-options = environment = CPPFLAGS=-I${zlib:location}/include - LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib + LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib diff --git a/component/fastjar/buildout.cfg b/component/fastjar/buildout.cfg index 42f50b5b9..c7fe1141e 100644 --- a/component/fastjar/buildout.cfg +++ b/component/fastjar/buildout.cfg @@ -9,4 +9,4 @@ url = http://sourceforge.net/projects/fastjar/files/fastjar/0.94/fastjar-0.94.ta md5sum = 14d4bdfac236e347d806c6743dba48c6 environment = CPPFLAGS=-I${zlib:location}/include - LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib + LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib diff --git a/component/ffmpeg/buildout.cfg b/component/ffmpeg/buildout.cfg index dcc249e15..943596eb2 100644 --- a/component/ffmpeg/buildout.cfg +++ b/component/ffmpeg/buildout.cfg @@ -95,8 +95,8 @@ configure-options = --enable-shared --enable-zlib --disable-static - --extra-ldflags="-Wl,-rpath -Wl,${buildout:parts-directory}/${:_buildout_section_name_}/lib" + --extra-ldflags="-Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib" environment = CPPFLAGS=-I${bzip2:location}/include -I${libogg:location}/include -I${libvorbis:location}/include -I${libtheora:location}/include -I${libvpx:location}/include -I${libx264:location}/include -I${lame:location}/include -I${opencore-amr:location}/include -I${zlib:location}/include - LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -L${libogg:location}/lib -Wl,-rpath -Wl,${libogg:location}/lib -L${libvorbis:location}/lib -Wl,-rpath -Wl,${libvorbis:location}/lib -L${libtheora:location}/lib -Wl,-rpath -Wl,${libtheora:location}/lib -L${libvpx:location}/lib -Wl,-rpath -Wl,${libvpx:location}/lib -L${libx264:location}/lib -Wl,-rpath -Wl,${libx264:location}/lib -L${lame:location}/lib -Wl,-rpath -Wl,${lame:location}/lib -L${opencore-amr:location}/lib -Wl,-rpath -Wl,${opencore-amr:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib + LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libogg:location}/lib -Wl,-rpath=${libogg:location}/lib -L${libvorbis:location}/lib -Wl,-rpath=${libvorbis:location}/lib -L${libtheora:location}/lib -Wl,-rpath=${libtheora:location}/lib -L${libvpx:location}/lib -Wl,-rpath=${libvpx:location}/lib -L${libx264:location}/lib -Wl,-rpath=${libx264:location}/lib -L${lame:location}/lib -Wl,-rpath=${lame:location}/lib -L${opencore-amr:location}/lib -Wl,-rpath=${opencore-amr:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib PATH=${yasm:location}/bin:%(PATH)s diff --git a/component/file/buildout.cfg b/component/file/buildout.cfg index aa66e8b5d..f8a33f6c0 100644 --- a/component/file/buildout.cfg +++ b/component/file/buildout.cfg @@ -12,4 +12,4 @@ configure-options = --disable-static environment = CPPFLAGS=-I${zlib:location}/include - LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib + LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib diff --git a/component/flare/buildout.cfg b/component/flare/buildout.cfg index 55891b33e..ef3990b16 100644 --- a/component/flare/buildout.cfg +++ b/component/flare/buildout.cfg @@ -14,5 +14,5 @@ configure-options = --with-tokyocabinet=${tokyocabinet:location} --with-boost=${boost-lib:location} environment = - LDFLAGS =-Wl,-rpath -Wl,${tokyocabinet:location}/lib -Wl,-rpath -Wl,${boost-lib:location}/lib + LDFLAGS =-Wl,-rpath=${tokyocabinet:location}/lib -Wl,-rpath=${boost-lib:location}/lib diff --git a/component/fontconfig/buildout.cfg b/component/fontconfig/buildout.cfg index 674c2ab1e..27081e36d 100644 --- a/component/fontconfig/buildout.cfg +++ b/component/fontconfig/buildout.cfg @@ -23,4 +23,4 @@ environment = PATH=${pkgconfig:location}/bin:%(PATH)s PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig CPPFLAGS=-I${zlib:location}/include - LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib + LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib diff --git a/component/freetype/buildout.cfg b/component/freetype/buildout.cfg index ca216bbdf..10da4526e 100644 --- a/component/freetype/buildout.cfg +++ b/component/freetype/buildout.cfg @@ -16,4 +16,4 @@ configure-options = --disable-static environment = CPPFLAGS=-I${zlib:location}/include - LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib + LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib diff --git a/component/gcc/buildout.cfg b/component/gcc/buildout.cfg index 79dbf1632..0e606f249 100644 --- a/component/gcc/buildout.cfg +++ b/component/gcc/buildout.cfg @@ -28,7 +28,7 @@ configure-options = --with-gmp=${gmp:location} environment = CPPFLAGS =-I${gmp:location}/include - LDFLAGS =-L${gmp:location}/lib -Wl,-rpath -Wl,${gmp:location}/lib + LDFLAGS =-L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib [mpc] recipe = hexagonit.recipe.cmmi @@ -39,7 +39,7 @@ configure-options = --with-mpfr=${mpfr:location} environment = CPPFLAGS =-I${mpfr:location}/include -I${gmp:location}/include - LDFLAGS =-L${mpfr:location}/lib -Wl,-rpath -Wl,${mpfr:location}/lib -L${gmp:location}/lib -Wl,-rpath -Wl,${gmp:location}/lib + LDFLAGS =-L${mpfr:location}/lib -Wl,-rpath=${mpfr:location}/lib -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib [ecj] recipe = hexagonit.recipe.download @@ -90,7 +90,7 @@ configure-options = environment = CPPFLAGS =-I${mpfr:location}/include -I${gmp:location}/include -I${mpc:location}/include - LDFLAGS =-L${mpfr:location}/lib -Wl,-rpath -Wl,${mpfr:location}/lib -L${gmp:location}/lib -Wl,-rpath -Wl,${gmp:location}/lib -Wl,-rpath -Wl,${mpc:location}/lib + 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 diff --git a/component/gettext/buildout.cfg b/component/gettext/buildout.cfg index 4275d4cc1..c84d0bac1 100644 --- a/component/gettext/buildout.cfg +++ b/component/gettext/buildout.cfg @@ -23,4 +23,4 @@ configure-options = environment = CPPFLAGS=-I${libxml2:location}/include -I${zlib:location}/include -I${ncurses:location}/include - LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath -Wl,${libxml2:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${ncurses:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib + 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 diff --git a/component/ghostscript/buildout.cfg b/component/ghostscript/buildout.cfg index fcccebc36..90f4b639a 100644 --- a/component/ghostscript/buildout.cfg +++ b/component/ghostscript/buildout.cfg @@ -28,7 +28,7 @@ environment = PATH=${pkgconfig:location}/bin:%(PATH)s PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig CPPFLAGS=-I${libtiff:location}/include - LDFLAGS=-Wl,-rpath -Wl,${fontconfig:location}/lib -L${libjpeg:location}/lib -Wl,-rpath -Wl,${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath -Wl,${libtiff:location}/lib + LDFLAGS=-Wl,-rpath=${fontconfig:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib LD_LIBRARY_PATH=${fontconfig:location}/lib [ghostscript] diff --git a/component/git/buildout.cfg b/component/git/buildout.cfg index 7a1b24643..ca62bc30b 100644 --- a/component/git/buildout.cfg +++ b/component/git/buildout.cfg @@ -27,4 +27,4 @@ configure-options = environment = PATH=${curl:location}/bin:%(PATH)s CPPFLAGS=-I${zlib:location}/include - LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib + LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib diff --git a/component/glib/buildout.cfg b/component/glib/buildout.cfg index bfcf564b9..812ad5611 100644 --- a/component/glib/buildout.cfg +++ b/component/glib/buildout.cfg @@ -15,5 +15,5 @@ configure-options = environment = CPPFLAGS=-I${zlib:location}/include -I${gettext:location}/include - LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib + LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib PATH=${gettext:location}/bin:%(PATH)s diff --git a/component/graphviz/buildout.cfg b/component/graphviz/buildout.cfg index ef9a7c9ba..2cbcb438b 100644 --- a/component/graphviz/buildout.cfg +++ b/component/graphviz/buildout.cfg @@ -53,4 +53,4 @@ environment = PATH=${pkgconfig:location}/bin:%(PATH)s PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig CPPFLAGS=-I${zlib:location}/include - LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib + LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib diff --git a/component/grep/buildout.cfg b/component/grep/buildout.cfg index 45aa8487a..589bb6cb4 100644 --- a/component/grep/buildout.cfg +++ b/component/grep/buildout.cfg @@ -10,4 +10,4 @@ url = http://ftp.gnu.org/gnu/grep/grep-2.8.tar.gz md5sum = cb2dfc502c5afc7a4a6e5f6cefd6850e environment = PKG_CONFIG_PATH=${pcre:location}/lib/pkgconfig - LDFLAGS =-Wl,--as-needed -Wl,-rpath -Wl,${pcre:location}/lib + LDFLAGS =-Wl,--as-needed -Wl,-rpath=${pcre:location}/lib diff --git a/component/imagemagick/buildout.cfg b/component/imagemagick/buildout.cfg index 3e2317e75..532429e58 100644 --- a/component/imagemagick/buildout.cfg +++ b/component/imagemagick/buildout.cfg @@ -71,4 +71,4 @@ environment = PATH=${freetype:location}/bin:${ghostscript:location}/bin:${pkgconfig:location}/bin:%(PATH)s PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include -I${jasper:location}/include -I${freetype:location}/include - LDFLAGS =-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -L${zlib:location}/lib -Wl,${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath -Wl,${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath -Wl,${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath -Wl,${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath -Wl,${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath -Wl,${freetype:location}/lib + LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,${zlib: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${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath=${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib diff --git a/component/jasper/buildout.cfg b/component/jasper/buildout.cfg index d9684ec72..9d9ddce24 100644 --- a/component/jasper/buildout.cfg +++ b/component/jasper/buildout.cfg @@ -13,4 +13,4 @@ configure-command = /bin/sh ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static --enable-shared --disable-opengl environment = CPPFLAGS=-I${libjpeg:location}/include - LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath -Wl,${libjpeg:location}/lib + LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib diff --git a/component/kumo/buildout.cfg b/component/kumo/buildout.cfg index c81141da3..96b6d77df 100644 --- a/component/kumo/buildout.cfg +++ b/component/kumo/buildout.cfg @@ -35,4 +35,4 @@ configure-options = environment = CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include - LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath -Wl,${tokyocabinet:location}/lib -Wl,-rpath -Wl,${messagepack:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib + LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${tokyocabinet:location}/lib -Wl,-rpath=${messagepack:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib diff --git a/component/libpng/buildout.cfg b/component/libpng/buildout.cfg index 0c1df62ed..e9653c63a 100644 --- a/component/libpng/buildout.cfg +++ b/component/libpng/buildout.cfg @@ -12,7 +12,7 @@ configure-options = --disable-static environment = CPPFLAGS =-I${zlib:location}/include - LDFLAGS =-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib + LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib [libpng12] <= libpng-common diff --git a/component/librsync/buildout.cfg b/component/librsync/buildout.cfg index d0a5422b4..172b5227f 100644 --- a/component/librsync/buildout.cfg +++ b/component/librsync/buildout.cfg @@ -15,4 +15,4 @@ configure-options = --enable-shared environment = CPPFLAGS=-I${zlib:location}/include -I${bzip2:location}/include -I${popt:location}/include - LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -L${popt:location}/lib -Wl,-rpath -Wl,${popt:location}/lib + LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib diff --git a/component/libtiff/buildout.cfg b/component/libtiff/buildout.cfg index 8435ba484..7d235c963 100644 --- a/component/libtiff/buildout.cfg +++ b/component/libtiff/buildout.cfg @@ -16,4 +16,4 @@ configure-options = --without-x environment = CPPFLAGS=-I${libjpeg:location}/include -I${jbigkit:location}/include -I${zlib:location}/include - LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath -Wl,${libjpeg:location}/lib -L${jbigkit:location}/lib -Wl,-rpath -Wl,${jbigkit:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib + LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib diff --git a/component/libxml2/buildout.cfg b/component/libxml2/buildout.cfg index e2f1a1410..02df26cad 100644 --- a/component/libxml2/buildout.cfg +++ b/component/libxml2/buildout.cfg @@ -15,4 +15,4 @@ configure-options = --without-python --with-zlib=${zlib:location} environment = - LDFLAGS = -Wl,-rpath -Wl,${zlib:location}/lib + LDFLAGS = -Wl,-rpath=${zlib:location}/lib diff --git a/component/libxslt/buildout.cfg b/component/libxslt/buildout.cfg index 7a64a7d62..41255e800 100644 --- a/component/libxslt/buildout.cfg +++ b/component/libxslt/buildout.cfg @@ -19,5 +19,5 @@ configure-options = environment = PATH=${pkgconfig:location}/bin:%(PATH)s CPPFLAGS=-I${zlib:location}/include - LDFLAGS=-Wl,-rpath -Wl,${zlib:location}/lib + LDFLAGS=-Wl,-rpath=${zlib:location}/lib PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig diff --git a/component/logrotate/buildout.cfg b/component/logrotate/buildout.cfg index 08c01adb1..21bceba75 100644 --- a/component/logrotate/buildout.cfg +++ b/component/logrotate/buildout.cfg @@ -10,4 +10,4 @@ md5sum = eeba9dbca62a9210236f4b83195e4ea5 configure-command = true make-options = PREFIX=${buildout:parts-directory}/${:_buildout_section_name_} environment = - POPT_DIR=${popt:location}/include -L${popt:location}/lib -Wl,-rpath -Wl,${popt:location}/lib + POPT_DIR=${popt:location}/include -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib diff --git a/component/mariadb/buildout.cfg b/component/mariadb/buildout.cfg index c94c12f28..9690b3f1a 100644 --- a/component/mariadb/buildout.cfg +++ b/component/mariadb/buildout.cfg @@ -35,4 +35,4 @@ configure-options = environment = CPPFLAGS =-I${ncurses:location}/include -I${readline:location}/include - LDFLAGS =-L${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${readline:location}/lib + LDFLAGS =-L${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib diff --git a/component/memcached/buildout.cfg b/component/memcached/buildout.cfg index 6cf41d7f1..c6b8432bb 100644 --- a/component/memcached/buildout.cfg +++ b/component/memcached/buildout.cfg @@ -49,5 +49,5 @@ patches = ${memcached-gcc4.6.patch:location}/${memcached-gcc4.6.patch:filename} patch-options = -p1 environment = - LDFLAGS =-Wl,-rpath ${libevent:location}/lib + LDFLAGS =-Wl,-rpath=${libevent:location}/lib diff --git a/component/mysql-5.1/buildout.cfg b/component/mysql-5.1/buildout.cfg index 7e22d17c5..c968693ff 100644 --- a/component/mysql-5.1/buildout.cfg +++ b/component/mysql-5.1/buildout.cfg @@ -60,4 +60,4 @@ patches = environment = PATH =${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s CPPFLAGS =-I${ncurses:location}/include -I${readline:location}/include - LDFLAGS =-L${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${readline:location}/lib + LDFLAGS =-L${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib diff --git a/component/mysql-tritonn-5.0/buildout.cfg b/component/mysql-tritonn-5.0/buildout.cfg index 582e51430..6514d768e 100644 --- a/component/mysql-tritonn-5.0/buildout.cfg +++ b/component/mysql-tritonn-5.0/buildout.cfg @@ -90,4 +90,4 @@ patches = environment = PATH=${senna:location}/bin:${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s CPPFLAGS=-I${senna:location}/include/senna -I${ncurses:location}/include -I${readline:location}/include - LDFLAGS=-L${senna:location}/lib -L${readline:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${readline:location}/lib + LDFLAGS=-L${senna:location}/lib -L${readline:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib diff --git a/component/neon/buildout.cfg b/component/neon/buildout.cfg index d788e37c7..703dcf87d 100644 --- a/component/neon/buildout.cfg +++ b/component/neon/buildout.cfg @@ -25,4 +25,4 @@ environment = PATH=${libxml2:location}/bin:${pkgconfig:location}/bin:%(PATH)s PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig CPPFLAGS=-I${openssl:location}/include -I${zlib:location}/include - LDFLAGS=-L${openssl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${libxml2:location}/lib + LDFLAGS=-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libxml2:location}/lib diff --git a/component/openldap/buildout.cfg b/component/openldap/buildout.cfg index 3af650d0c..c09a66926 100644 --- a/component/openldap/buildout.cfg +++ b/component/openldap/buildout.cfg @@ -23,4 +23,4 @@ configure-options = environment = CPPFLAGS=-I${openssl:location}/include -I${cyrus-sasl:location}/include - LDFLAGS=-L${openssl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -L${cyrus-sasl:location}/lib -Wl,-rpath -Wl,${cyrus-sasl:location}/lib + LDFLAGS=-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${cyrus-sasl:location}/lib -Wl,-rpath=${cyrus-sasl:location}/lib diff --git a/component/openssl/buildout.cfg b/component/openssl/buildout.cfg index 8bbc720cb..257f51a39 100644 --- a/component/openssl/buildout.cfg +++ b/component/openssl/buildout.cfg @@ -27,5 +27,5 @@ configure-options = # it seems that parallel build sometimes fails for openssl. make-options = -j1 - LDFLAGS="-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${buildout:parts-directory}/${:_buildout_section_name_}/lib" - SHARED_LDFLAGS="-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${buildout:parts-directory}/${:_buildout_section_name_}/lib" + LDFLAGS="-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib" + SHARED_LDFLAGS="-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib" diff --git a/component/pdftk/buildout.cfg b/component/pdftk/buildout.cfg index 261f20f1c..f636fce05 100644 --- a/component/pdftk/buildout.cfg +++ b/component/pdftk/buildout.cfg @@ -40,5 +40,5 @@ make-options = pre-make-hook = ${pdftk-hooks-download:location}/${pdftk-hooks-download:filename}:pre_make_hook environment = PATH=${gcc-java:location}/bin:${fastjar:location}/bin:%(PATH)s - LDFLAGS=-L${gcc-java:location}/lib -Wl,-rpath -Wl,${gcc-java:location}/lib -L${gcc-java:location}/lib64 -Wl,-rpath -Wl,${gcc-java:location}/lib64 + LDFLAGS=-L${gcc-java:location}/lib -Wl,-rpath=${gcc-java:location}/lib -L${gcc-java:location}/lib64 -Wl,-rpath=${gcc-java:location}/lib64 LD_LIBRARY_PATH=${gcc-java:location}/lib:${gcc-java:location}/lib64 diff --git a/component/perl-SGML-Parser-OpenSP/buildout.cfg b/component/perl-SGML-Parser-OpenSP/buildout.cfg index a462ad1f7..3b56fc1ce 100644 --- a/component/perl-SGML-Parser-OpenSP/buildout.cfg +++ b/component/perl-SGML-Parser-OpenSP/buildout.cfg @@ -17,4 +17,4 @@ configure-command = ${perl:location}/bin/perl Makefile.PL make-options = INC=-I${opensp:location}/include - OTHERLDFLAGS="-L${opensp:location}/lib -Wl,-rpath -Wl,${opensp:location}/lib" + OTHERLDFLAGS="-L${opensp:location}/lib -Wl,-rpath=${opensp:location}/lib" diff --git a/component/perl-XML-LibXML/buildout.cfg b/component/perl-XML-LibXML/buildout.cfg index fbb34c74b..c6072e9c5 100644 --- a/component/perl-XML-LibXML/buildout.cfg +++ b/component/perl-XML-LibXML/buildout.cfg @@ -23,7 +23,7 @@ configure-command = # Parallel make does not work for this package on fast machines # with many cores make-options = - OTHERLDFLAGS=" -Wl,-rpath -Wl,${libxml2:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib" -j1 + OTHERLDFLAGS=" -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${zlib:location}/lib" -j1 environment = LD_LIBRARY_PATH=${libxml2:location}/lib:${zlib:location}/lib PERLLIB=blib/lib diff --git a/component/perl/buildout.cfg b/component/perl/buildout.cfg index 084d3a7ac..98f0ee708 100644 --- a/component/perl/buildout.cfg +++ b/component/perl/buildout.cfg @@ -25,7 +25,7 @@ configure-command = -Dprefix=${buildout:parts-directory}/${:_buildout_section_name_} \ -Dsiteprefix=${buildout:parts-directory}/site_${:_buildout_section_name_} \ -Dcflags=-I${gdbm:location}/include \ - -Dldflags="-L${gdbm:location}/lib -Wl,-rpath -Wl,${gdbm:location}/lib" \ + -Dldflags="-L${gdbm:location}/lib -Wl,-rpath=${gdbm:location}/lib" \ -Ui_db \ -Dnoextensions=ODBM_File environment = diff --git a/component/pkgconfig/buildout.cfg b/component/pkgconfig/buildout.cfg index c278e5f57..210a555db 100644 --- a/component/pkgconfig/buildout.cfg +++ b/component/pkgconfig/buildout.cfg @@ -26,4 +26,4 @@ environment = PATH=${:location}/bin:%(PATH)s PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig CPPFLAGS=-I${glib:location}/include -I${popt:location}/include - LDFLAGS=-L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${glib:location}/lib -L${popt:location}/lib -Wl,-rpath -Wl,${popt:location}/lib + LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib diff --git a/component/poppler/buildout.cfg b/component/poppler/buildout.cfg index 7e73f5656..3c691be86 100644 --- a/component/poppler/buildout.cfg +++ b/component/poppler/buildout.cfg @@ -21,4 +21,4 @@ environment = PATH=${pkgconfig:location}/bin:%(PATH)s PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${libcurl:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig CPPFLAGS=-I${libjpeg:location}/include -I${libtiff:location}/include -I${zlib:location}/include - LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath -Wl,${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath -Wl,${libtiff:location}/lib -L${zlib:location}/lib -Wl,${zlib:location}/lib + LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${zlib:location}/lib -Wl,${zlib:location}/lib diff --git a/component/postfix/buildout.cfg b/component/postfix/buildout.cfg index 5e6bd747f..cd5151bfa 100644 --- a/component/postfix/buildout.cfg +++ b/component/postfix/buildout.cfg @@ -15,5 +15,5 @@ url = ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.8.3.tar md5sum = b3922ededd3fd6051f759e58a4ada3ae location = ${buildout:parts-directory}/${:_buildout_section_name_} configure-command = make -configure-options = makefiles CCARGS='-DUSE_TLS -DHAS_PCRE -DHAS_DB -I${libdb:location}/include -I${pcre:location}/include -I${openssl:location}/include' AUXLIBS='-L${openssl:location}/lib -L${pcre:location}/lib -L${libdb:location}/lib -lssl -lpcre -ldb -lcrypto -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${pcre:location}/lib -Wl,-rpath -Wl,${libdb:location}/lib' +configure-options = makefiles CCARGS='-DUSE_TLS -DHAS_PCRE -DHAS_DB -I${libdb:location}/include -I${pcre:location}/include -I${openssl:location}/include' AUXLIBS='-L${openssl:location}/lib -L${pcre:location}/lib -L${libdb:location}/lib -lssl -lpcre -ldb -lcrypto -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${libdb:location}/lib' make-targets = non-interactive-package install_root=${:location} diff --git a/component/python-2.4/buildout.cfg b/component/python-2.4/buildout.cfg index 760edf244..3146a685e 100644 --- a/component/python-2.4/buildout.cfg +++ b/component/python-2.4/buildout.cfg @@ -59,7 +59,7 @@ configure-options = environment = CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include/ -I${ncurses:location}/include/ncursesw/ -I${bzip2:location}/include -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include - LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${gdbm:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib + LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib [pythonbin2.4] # XXX/Note: This is hackish way to have fully featured python interpreter diff --git a/component/python-2.6/buildout.cfg b/component/python-2.6/buildout.cfg index 22a4bd307..6755b652e 100644 --- a/component/python-2.6/buildout.cfg +++ b/component/python-2.6/buildout.cfg @@ -43,7 +43,7 @@ configure-options = environment = CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include/ -I${ncurses:location}/include/ncursesw/ -I${bzip2:location}/include -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include - LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${gdbm:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib + LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib [bootstrap2.6] recipe = zc.recipe.egg diff --git a/component/python-2.7/buildout.cfg b/component/python-2.7/buildout.cfg index e53c3d1f5..765488f74 100644 --- a/component/python-2.7/buildout.cfg +++ b/component/python-2.7/buildout.cfg @@ -52,4 +52,4 @@ configure-options = environment = CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include/ -I${ncurses:location}/include/ncursesw/ -I${bzip2:location}/include -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include - LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${gdbm:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib + LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib diff --git a/component/readline/buildout.cfg b/component/readline/buildout.cfg index a289efc93..97d9cee59 100644 --- a/component/readline/buildout.cfg +++ b/component/readline/buildout.cfg @@ -12,4 +12,4 @@ configure-options = --disable-static --with-ncurses=${ncurses:location} environment = - LDFLAGS =-Wl,-rpath ${ncurses:location}/lib + LDFLAGS =-Wl,-rpath=${ncurses:location}/lib diff --git a/component/serf/buildout.cfg b/component/serf/buildout.cfg index 8fcc193a0..62cefa3cd 100644 --- a/component/serf/buildout.cfg +++ b/component/serf/buildout.cfg @@ -17,4 +17,4 @@ configure-options = --with-openssl=${openssl:location} environment = CFLAGS=-I${zlib:location}/include -I${libuuid:location}/include - LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib + LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib diff --git a/component/sphinx/buildout.cfg b/component/sphinx/buildout.cfg index fc29115b3..996054b91 100644 --- a/component/sphinx/buildout.cfg +++ b/component/sphinx/buildout.cfg @@ -38,4 +38,4 @@ patches = ${sphinx-1.10-beta-snowball.patch:location}/${sphinx-1.10-beta-snowball.patch:filename} environment = CPPFLAGS=-I${zlib:location}/include -I${libexpat:location}/include - LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath ${mariadb:location}/lib/mysql -L${libexpat:location}/lib -Wl,-rpath ${libexpat:location}/lib + LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib/mysql -L${libexpat:location}/lib -Wl,-rpath=${libexpat:location}/lib diff --git a/component/sqlite3/buildout.cfg b/component/sqlite3/buildout.cfg index da61fd11f..053b3bba4 100644 --- a/component/sqlite3/buildout.cfg +++ b/component/sqlite3/buildout.cfg @@ -12,4 +12,4 @@ configure-options = --enable-readline environment = CPPFLAGS=-I${readline:location}/include -I${ncurses:location}/include - LDFLAGS=-L${buildout:parts-directory}/${:_buildout_section_name_} -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib + LDFLAGS=-L${buildout:parts-directory}/${:_buildout_section_name_} -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib diff --git a/component/stunnel/buildout.cfg b/component/stunnel/buildout.cfg index e3286eb0c..3f06b3269 100644 --- a/component/stunnel/buildout.cfg +++ b/component/stunnel/buildout.cfg @@ -26,4 +26,4 @@ configure-options = --with-ssl=${openssl:location} environment = CPPFLAGS=-I${zlib:location}/include - LDFLAGS=-Wl,-rpath -Wl,${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib + LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib diff --git a/component/subversion/buildout.cfg b/component/subversion/buildout.cfg index 42e4dec08..73db2c00a 100644 --- a/component/subversion/buildout.cfg +++ b/component/subversion/buildout.cfg @@ -58,4 +58,4 @@ environment = PATH=${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 -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -Wl,-rpath -Wl,${neon:location}/lib -Wl,-rpath -Wl,${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib + 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 diff --git a/component/tesseract/buildout.cfg b/component/tesseract/buildout.cfg index c29aa8ddc..eb738c8c3 100644 --- a/component/tesseract/buildout.cfg +++ b/component/tesseract/buildout.cfg @@ -28,7 +28,7 @@ configure-options = --datarootdir=${tesseract-share:location} environment = CPPFLAGS=-I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include - LDFLAGS =-Wl,-rpath -L${zlib:location}/lib -Wl,${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath -Wl,${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath -Wl,${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath -Wl,${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib + LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib: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${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib [tesseract-eng-traineddata] recipe = hexagonit.recipe.download diff --git a/component/tokyocabinet/buildout.cfg b/component/tokyocabinet/buildout.cfg index bb9ba190d..846761fb1 100644 --- a/component/tokyocabinet/buildout.cfg +++ b/component/tokyocabinet/buildout.cfg @@ -14,4 +14,4 @@ configure-options = --with-bzip=${bzip2:location} environment = - LDFLAGS =-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib + LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib diff --git a/component/varnish/buildout.cfg b/component/varnish/buildout.cfg index d968d0709..011f76508 100644 --- a/component/varnish/buildout.cfg +++ b/component/varnish/buildout.cfg @@ -22,7 +22,7 @@ configure-options = --disable-static environment = CPPFLAGS=-I${ncurses:location}/include - LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib + LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib [varnish-2.1] recipe = hexagonit.recipe.cmmi @@ -34,4 +34,4 @@ environment = PATH=${pkgconfig:location}/bin:%(PATH)s PKG_CONFIG_PATH=${pcre:location}/lib/pkgconfig CPPFLAGS=-I${ncurses:location}/include - LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib + LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib diff --git a/component/w3m/buildout.cfg b/component/w3m/buildout.cfg index 99fe54a5b..32e55e2d0 100644 --- a/component/w3m/buildout.cfg +++ b/component/w3m/buildout.cfg @@ -31,4 +31,4 @@ environment = PATH=${pkgconfig:location}/bin:%(PATH)s PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig CPPFLAGS=-I${ncurses:location}/include/ -I${zlib:location}/include/ - LDFLAGS=-Wl,--as-needed -L${garbage-collector:location}/lib -Wl,-rpath -Wl,${garbage-collector:location}/lib -L${ncurses:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -L${openssl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib + 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 diff --git a/component/xtrabackup/buildout.cfg b/component/xtrabackup/buildout.cfg index 4245044aa..716ec9ad2 100644 --- a/component/xtrabackup/buildout.cfg +++ b/component/xtrabackup/buildout.cfg @@ -47,7 +47,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_} configure-command = utils/build.sh innodb51_builtin ${:location} ${libtool:location} environment = CPPFLAGS =-I${zlib:location}/include -I${ncurses:location}/include -I${readline:location}/include - LDFLAGS =-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${ncurses:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -L${readline:location}/lib -Wl,-rpath -Wl,${readline:location}/lib + LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib PATH=${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${flex:location}/bin:%(PATH)s:${bison:location}/bin make-options = -j1 -- 2.30.9