Change all linker flags to be compatible with *BSD

component/apache/buildout.cfg

@@ -88,7 +88,7 @@ environment =
   PATH=${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
+  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
 
 [mod_antiloris-apache-2.4.patch]
 # http://www.apachelounge.com/viewtopic.php?p=19139
@@ -174,7 +174,7 @@ environment =
   PATH=${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
+  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-apache-2.2]
 # Note: Shall react on each build of apache and reinstall itself

component/cloud9/buildout.cfg

@@ -42,4 +42,4 @@ packages =
   cloud9
 # Specify environment jsDAV (dependency of cloud9) needs libxml2
 environment = 
-  LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib
+  LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath,${libxml2:location}/lib

component/corosync/buildout.cfg

@@ -11,4 +11,4 @@ md5sum = c58459a009a3a9d0b9c00e276a190d90
 environment =
   CPPFLAGS=-I${nspr:location}/include/nspr -I${nss:location}/include/nss
   PKG_CONFIG_PATH=${nss:location}/lib/pkgconfig:${nspr:location}/lib/pkgconfig
-  LDFLAGS =-L${nspr:location}/lib -Wl,-rpath=${nspr:location}/lib -L${nss:location}/lib -Wl,-rpath=${nss:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib
+  LDFLAGS =-L${nspr:location}/lib -Wl,-rpath,${nspr:location}/lib -L${nss:location}/lib -Wl,-rpath,${nss:location}/lib -Wl,-rpath,${buildout:parts-directory}/${:_buildout_section_name_}/lib

component/couchdb/buildout.cfg

@@ -24,4 +24,4 @@ environment-section = couchdb-environ
 PATH = ${erlang:location}/bin:${icu4c:location}/bin:${curl:location}/bin:%(PATH)s
 # XXX: Gotta put everything on the same line. If not, it won't compile
 CFLAGS = -I${icu4c:location}/include -I${spidermonkey-1.7:location}/include -I${curl:location}/include
-LDFLAGS = -L${icu4c:location}/lib -Wl,-rpath=${icu4c:location}/lib -L${spidermonkey-1.7:location}/lib -Wl,-rpath=${spidermonkey-1.7:location}/lib -L${curl:location}/lib -Wl,-rpath=${curl:location}/lib
+LDFLAGS = -L${icu4c:location}/lib -Wl,-rpath,${icu4c:location}/lib -L${spidermonkey-1.7:location}/lib -Wl,-rpath,${spidermonkey-1.7:location}/lib -L${curl:location}/lib -Wl,-rpath,${curl:location}/lib

component/curl/buildout.cfg

@@ -36,4 +36,4 @@ configure-options =
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
-  LDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib
+  LDFLAGS=-Wl,-rpath,${zlib:location}/lib -Wl,-rpath,${openssl:location}/lib

component/cyrus-sasl/buildout.cfg

@@ -38,4 +38,4 @@ make-options =
 
 environment =
   CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath,${zlib:location}/lib

component/dropbear/buildout.cfg

@@ -53,7 +53,7 @@ configure-options =
 
 environment =
   CPPFLAGS =-I${zlib:location}/include
-  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -L${zlib:location}/lib
+  LDFLAGS =-Wl,-rpath,${zlib:location}/lib -L${zlib:location}/lib
 
 patches=
   ${dropbear-userspace-patch:location}/${dropbear-userspace-patch:filename}

component/erlang/buildout.cfg

@@ -20,7 +20,7 @@ configure-options =
 environment=
     PATH=${java-sdk-1.6.0:location}/bin:%(PATH)s
     CFLAGS=-I${ncurses:location}/include -I${zlib:location}/include/
-    LDFLAGS=-L${ncurses:location}/lib/ -L${zlib:location}/lib/ -Wl,-rpath=${ncurses:location}/lib/ -Wl,-rpath=${zlib:location}/lib/
+    LDFLAGS=-L${ncurses:location}/lib/ -L${zlib:location}/lib/ -Wl,-rpath,${ncurses:location}/lib/ -Wl,-rpath,${zlib:location}/lib/
 
 make-options =
     -j1

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=${zlib:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath,${zlib:location}/lib

component/ffmpeg/buildout.cfg

@@ -95,8 +95,8 @@ configure-options =
  --enable-shared
  --enable-zlib
  --disable-static
- --extra-ldflags="-Wl,-rpath=${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=${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
+  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

component/file/buildout.cfg

@@ -14,4 +14,4 @@ configure-options =
   --disable-static
 environment =
   CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath,${zlib:location}/lib

component/flare/buildout.cfg

@@ -14,5 +14,5 @@ configure-options =
   --with-tokyocabinet=${tokyocabinet:location}
   --with-boost=${boost-lib:location}
 environment =
-  LDFLAGS =-Wl,-rpath=${tokyocabinet:location}/lib -Wl,-rpath=${boost-lib:location}/lib
+  LDFLAGS =-Wl,-rpath,${tokyocabinet:location}/lib -Wl,-rpath,${boost-lib:location}/lib
 

component/fontconfig/buildout.cfg

@@ -26,4 +26,4 @@ environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig
   CPPFLAGS=-I${zlib:location}/include -I${bzip2:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath,${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath,${bzip2:location}/lib

component/freetype/buildout.cfg

@@ -17,4 +17,4 @@ configure-options =
   --disable-static
 environment =
   CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath,${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath,${zlib:location}/lib

component/gcc/buildout.cfg

@@ -17,7 +17,7 @@ configure-options =
   --with-gmp=${gmp:location}
   --disable-static
 environment =
-  LDFLAGS=-Wl,-rpath=${gmp:location}/lib
+  LDFLAGS=-Wl,-rpath,${gmp:location}/lib
 
 [mpc]
 recipe = hexagonit.recipe.cmmi
@@ -28,7 +28,7 @@ configure-options =
   --with-mpfr=${mpfr:location}
   --disable-static
 environment =
-  LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp:location}/lib
+  LDFLAGS=-Wl,-rpath,${mpfr:location}/lib -Wl,-rpath,${gmp:location}/lib
 
 [ppl]
 recipe = hexagonit.recipe.cmmi
@@ -41,7 +41,7 @@ configure-options =
   --disable-static
 environment =
   PATH=${m4:location}/bin:%(PATH)s
-  LDFLAGS=-Wl,-rpath=${gmp:location}/lib
+  LDFLAGS=-Wl,-rpath,${gmp:location}/lib
 
 [cloog-ppl]
 recipe = hexagonit.recipe.cmmi
@@ -53,7 +53,7 @@ configure-options =
   --disable-static
 environment =
   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
@@ -127,7 +127,7 @@ configure-options =
 
 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
+  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
@@ -160,7 +160,7 @@ configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
 
 environment =
-  LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${ppl:location}/lib -Wl,-rpath=${cloog-ppl:location}/lib
+  LDFLAGS=-Wl,-rpath,${mpfr:location}/lib -Wl,-rpath,${gmp:location}/lib -Wl,-rpath,${mpc:location}/lib -Wl,-rpath,${ppl:location}/lib -Wl,-rpath,${cloog-ppl:location}/lib
   PATH=${zip:location}/bin:%(PATH)s
 # make install does not work when several core are used
 make-targets = install -j1

component/gettext/buildout.cfg

@@ -24,4 +24,4 @@ configure-options =
 
 environment =
   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
+  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

component/ghostscript/buildout.cfg

@@ -21,7 +21,7 @@ make-options = -j1
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${libtiff:location}/lib/pkgconfig
-  LDFLAGS=-Wl,-rpath=${fontconfig:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -Wl,-rpath=${libtiff:location}/lib
+  LDFLAGS=-Wl,-rpath,${fontconfig:location}/lib -L${libjpeg:location}/lib -Wl,-rpath,${libjpeg:location}/lib -Wl,-rpath,${libtiff:location}/lib
   LD_LIBRARY_PATH=${fontconfig:location}/lib:${libtiff:location}/lib
 
 [ghostscript]

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=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath,${openssl:location}/lib -Wl,-rpath,${zlib:location}/lib

component/glib/buildout.cfg

@@ -12,8 +12,9 @@ configure-options =
   --disable-selinux
   --disable-fam
   --disable-xattr
+  --with-libiconv=gnu
 
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${gettext:location}/lib -Wl,-rpath=${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

component/gnutls/buildout.cfg

@@ -19,7 +19,7 @@ configure-options =
   --with-gpg-error-prefix=${gpg-error:location}
 environment =
   CPPFLAGS=-I${gpg-error:location}/include
-  LDFLAGS=-lgpg-error -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib
+  LDFLAGS=-lgpg-error -L${gpg-error:location}/lib -Wl,-rpath,${gpg-error:location}/lib
 
 [gnutls]
 # XXX-Cedric : update to latest gnutls
@@ -31,5 +31,5 @@ configure-options =
   --disable-static
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${gcrypt:location}/include -I${gpg-error:location}/include
-  LDFLAGS=-lgcrypt -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${gcrypt:location}/lib -Wl,-rpath=${gcrypt:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib
+  LDFLAGS=-lgcrypt -L${readline:location}/lib -Wl,-rpath,${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath,${ncurses:location}/lib -L${gcrypt:location}/lib -Wl,-rpath,${gcrypt:location}/lib -L${zlib:location}/lib -Wl,-rpath,${zlib:location}/lib -L${gpg-error:location}/lib -Wl,-rpath,${gpg-error:location}/lib
   PKG_CONFIG=${zlib:location}/lib/pkgconfig

component/graphviz/buildout.cfg

@@ -52,4 +52,4 @@ environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig
   CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath,${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath,${zlib:location}/lib

component/grep/buildout.cfg

@@ -10,4 +10,4 @@ url = http://ftp.gnu.org/gnu/grep/grep-2.9.tar.gz
 md5sum = 03e3451a38b0d615cb113cbeaf252dc0
 environment =
   CPPFLAGS=-I${pcre:location}/include
-  LDFLAGS=-L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib
+  LDFLAGS=-L${pcre:location}/lib -Wl,-rpath,${pcre:location}/lib

component/gtk-2/buildout.cfg

@@ -24,7 +24,7 @@ environment =
   PATH=${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig
   CPPFLAGS=-I${libpng:location}/include/ -I${zlib:location}/include -I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath,${zlib:location}/lib -L${libXrender:location}/lib -Wl,-rpath,${libXrender:location}/lib
   LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib
 
 [pango]
@@ -38,7 +38,7 @@ environment =
   PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig::${libXrender:location}/lib/pkgconfig
   CPPFLAGS=-I${cairo:location}/include/cairo -I${libX11:location}/include/X11 -I${libxcb:location}/include/xcb -I${libXau:location}/include/X11 -I${bzip2:location}/include -L${libXrender:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${cairo:location}/lib -Wl,-rpath=${cairo:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libxcb:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${libXau:location}/lib -Wl,-rpath=${libXau:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -lXrender -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-L${cairo:location}/lib -Wl,-rpath,${cairo:location}/lib -L${libX11:location}/lib -Wl,-rpath,${libX11:location}/lib -L${libxcb:location}/lib -Wl,-rpath,${libxcb:location}/lib -L${libXau:location}/lib -Wl,-rpath,${libXau:location}/lib -L${bzip2:location}/lib -Wl,-rpath,${bzip2:location}/lib -L${libXrender:location}/lib -Wl,-rpath,${libXrender:location}/lib -lXrender -L${zlib:location}/lib -Wl,-rpath,${zlib:location}/lib
   LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib
 
 [gdk-pixbuf]
@@ -52,7 +52,7 @@ environment =
   PATH=${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gettext:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig
   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
+  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
   LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib
   
 [atk]
@@ -62,7 +62,7 @@ md5sum = 87f20b78deaedef858ac54358c0786b1
 environment = 
   PATH=${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig
-  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${gettext:location}/lib
+  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath,${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath,${gettext:location}/lib
   LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib
 
 [gtk-2]
@@ -79,5 +79,5 @@ environment =
   PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xcbproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig
   CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include -I${libXext:location}/include -I${cairo:location}/include/cairo -I${zlib:location}/include -I${bzip2:location}/include -I${libXdmcp:location}/include -I${glib:location}/include/gio-unix-2.0 -I${glib:location}/include/glib-2.0 -I${glib:location}/include -I${atk:location}/include/atk-1.0
-  LDFLAGS=-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${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${xproto:location}/lib -Wl,-rpath=${xproto:location}/lib -L${kbproto:location}/lib -Wl,-rpath=${kbproto:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -L${render:location}/lib -Wl,-rpath=${render:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib -L${cairo:location}/lib -Wl,-rpath=${cairo:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libXdmcp:location}/lib -Wl,-rpath=${libXdmcp:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib  -L${atk:location}/lib -Wl,-rpath=${atk:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+  LDFLAGS=-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${libX11:location}/lib -Wl,-rpath,${libX11:location}/lib -L${xproto:location}/lib -Wl,-rpath,${xproto:location}/lib -L${kbproto:location}/lib -Wl,-rpath,${kbproto:location}/lib -L${libXrender:location}/lib -Wl,-rpath,${libXrender:location}/lib -L${render:location}/lib -Wl,-rpath,${render:location}/lib -L${libXext:location}/lib -Wl,-rpath,${libXext:location}/lib -L${cairo:location}/lib -Wl,-rpath,${cairo:location}/lib -L${zlib:location}/lib -Wl,-rpath,${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath,${bzip2:location}/lib -L${libXdmcp:location}/lib -Wl,-rpath,${libXdmcp:location}/lib -L${glib:location}/lib -Wl,-rpath,${glib:location}/lib  -L${atk:location}/lib -Wl,-rpath,${atk:location}/lib -L${gettext:location}/lib -Wl,-rpath,${gettext:location}/lib
   LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib:${libX11:location}/lib

component/imagemagick/buildout.cfg

@@ -65,4 +65,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=${bzip2:location}/lib -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 -L${jasper:location}/lib -Wl,-rpath=${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath,${bzip2:location}/lib -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 -L${jasper:location}/lib -Wl,-rpath,${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath,${freetype:location}/lib

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=${libjpeg:location}/lib
+  LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath,${libjpeg:location}/lib

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=${tokyocabinet:location}/lib -Wl,-rpath=${messagepack:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${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

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=${zlib:location}/lib
+  LDFLAGS =-L${zlib:location}/lib -Wl,-rpath,${zlib:location}/lib
 
 [libpng12]
 <= libpng-common

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=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${popt:location}/lib -Wl,-rpath=${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

component/libtiff/buildout.cfg

@@ -19,4 +19,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=${libjpeg:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${zlib:location}/lib -Wl,-rpath=${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

component/libxml2/buildout.cfg

@@ -15,4 +15,4 @@ configure-options =
   --without-python
   --with-zlib=${zlib:location}
 environment =
-    LDFLAGS = -Wl,-rpath=${zlib:location}/lib
+    LDFLAGS = -Wl,-rpath,${zlib:location}/lib

component/libxslt/buildout.cfg

@@ -21,5 +21,5 @@ configure-options =
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-Wl,-rpath,${zlib:location}/lib
   PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig

component/logrotate/buildout.cfg

@@ -20,4 +20,4 @@ patches =
 configure-command = true
 make-options = PREFIX=${buildout:parts-directory}/${:_buildout_section_name_} 
 environment =
-  POPT_DIR=${popt:location}/include -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib
+  POPT_DIR=${popt:location}/include -L${popt:location}/lib -Wl,-rpath,${popt:location}/lib

component/mariadb/buildout.cfg

@@ -59,7 +59,7 @@ patches =
   ${mariadb-no_test-patch:location}/${mariadb-no_test-patch:filename}
 environment =
   CPPFLAGS=-I${ncurses:location}/include -I${readline5:location}/include
-  LDFLAGS=-Wl,-rpath=${libevent:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline5:location}/lib -Wl,-rpath=${readline5:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-Wl,-rpath,${libevent:location}/lib -L${ncurses:location}/lib -Wl,-rpath,${ncurses:location}/lib -L${readline5:location}/lib -Wl,-rpath,${readline5:location}/lib -Wl,-rpath,${zlib:location}/lib
 
 [mroonga-mariadb]
 recipe = hexagonit.recipe.cmmi

component/memcached/buildout.cfg

@@ -38,4 +38,4 @@ configure-options =
   --disable-docs
 environment =
   PATH=${autoconf:location}/bin:${automake-1.11:location}/bin:%(PATH)s
-  LDFLAGS =-Wl,-rpath=${libevent:location}/lib
+  LDFLAGS =-Wl,-rpath,${libevent:location}/lib

component/memstrike/buildout.cfg

@@ -20,7 +20,7 @@ configure-options =
   --with-libmemcached=${libmemcached:location}
 environment =
   PATH =${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:%(PATH)s
-  LDFLAGS =-Wl,-rpath=${libmemcached:location}/lib
+  LDFLAGS =-Wl,-rpath,${libmemcached:location}/lib
 
 [memstrikesource]
 recipe=plone.recipe.command

component/mysql-5.1/buildout.cfg

@@ -71,7 +71,7 @@ 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=${zlib:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${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
 
 [groonga-storage-engine-mysql-5.1]
 recipe = hexagonit.recipe.cmmi

component/mysql-tritonn-5.0/buildout.cfg

@@ -89,4 +89,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${readline5:location}/include
-    LDFLAGS=-L${senna:location}/lib -L${readline5:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline5:location}/lib
+    LDFLAGS=-L${senna:location}/lib -L${readline5:location}/lib -L${ncurses:location}/lib -Wl,-rpath,${zlib:location}/lib -Wl,-rpath,${openssl:location}/lib -Wl,-rpath,${ncurses:location}/lib -Wl,-rpath,${readline5:location}/lib

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=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libxml2:location}/lib
+  LDFLAGS=-L${openssl:location}/lib -Wl,-rpath,${openssl:location}/lib -Wl,-rpath,${zlib:location}/lib -Wl,-rpath,${libxml2:location}/lib

component/nodejs/buildout.cfg

@@ -21,7 +21,7 @@ environment =
   PATH=${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
   CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-Wl,-rpath,${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath,${zlib:location}/lib
 
 [nodejs-0.4]
 recipe = hexagonit.recipe.cmmi
@@ -34,7 +34,7 @@ environment =
   PATH=${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
   CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-Wl,-rpath,${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath,${zlib:location}/lib
 
 [npm]
 # Node.js Package Manager

component/nss/buildout.cfg

@@ -39,10 +39,10 @@ command =
         USE_64=1 \
         BUILD_OPT=1 \
         ZLIB_INCLUDE_DIR=-I${zlib:location}/include \
-        ZLIB_LIBS="-lz -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib" \
+        ZLIB_LIBS="-lz -L${zlib:location}/lib -Wl,-rpath,${zlib:location}/lib" \
         NSPR_INCLUDE_DIR=${nspr:location}/include/nspr \
-        NSPR_LIB_DIR="${nspr:location}/lib -Wl,-rpath=${nspr:location}/lib" \
-        NSSUTIL_LIB_DIR="${:location}/lib -Wl,-rpath=${:location}/lib" \
+        NSPR_LIB_DIR="${nspr:location}/lib -Wl,-rpath,${nspr:location}/lib" \
+        NSSUTIL_LIB_DIR="${:location}/lib -Wl,-rpath,${:location}/lib" \
         nss_build_all &&
   mkdir -p ${:destination}/bin &&
   mkdir -p ${:destination}/include/nss3 &&

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=${openssl:location}/lib -L${cyrus-sasl:location}/lib -Wl,-rpath=${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

component/openssl/buildout.cfg

@@ -42,7 +42,7 @@ configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --libdir=lib
   shared no-idea no-mdc2 no-rc5 zlib
-  -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib
+  -Wl,-rpath,${zlib:location}/lib -Wl,-rpath,${buildout:parts-directory}/${:_buildout_section_name_}/lib
 
 # it seems that parallel build sometimes fails for openssl.
 make-options =

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-minimal:location}/bin:${fastjar:location}/bin:%(PATH)s
-  LDFLAGS=-L${gcc-java-minimal:location}/lib -Wl,-rpath=${gcc-java-minimal:location}/lib -L${gcc-java-minimal:location}/lib64 -Wl,-rpath=${gcc-java-minimal:location}/lib64
+  LDFLAGS=-L${gcc-java-minimal:location}/lib -Wl,-rpath,${gcc-java-minimal:location}/lib -L${gcc-java-minimal:location}/lib64 -Wl,-rpath,${gcc-java-minimal:location}/lib64
   LD_LIBRARY_PATH=${gcc-java-minimal:location}/lib:${gcc-java-minimal:location}/lib64

component/perl-DBD-MySQL/buildout.cfg

@@ -20,4 +20,4 @@ patch-options = -p1
 configure-command =
   ${perl:location}/bin/perl Makefile.PL --mysql_config=${mysql-tritonn-5.0:location}/bin/mysql_config
 environment =
-  OTHERLDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mysql-tritonn-5.0:location}/lib/mysql -Wl,-rpath=${openssl:location}/lib
+  OTHERLDFLAGS=-Wl,-rpath,${zlib:location}/lib -Wl,-rpath,${mysql-tritonn-5.0:location}/lib/mysql -Wl,-rpath,${openssl:location}/lib

component/perl-DBD-mariadb/buildout.cfg

@@ -20,4 +20,4 @@ patch-options = -p1
 configure-command =
   ${perl:location}/bin/perl Makefile.PL --mysql_config=${mariadb:location}/bin/mysql_config
 environment =
-  OTHERLDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib/mysql -Wl,-rpath=${openssl:location}/lib
+  OTHERLDFLAGS=-Wl,-rpath,${zlib:location}/lib -Wl,-rpath,${mariadb:location}/lib/mysql -Wl,-rpath,${openssl:location}/lib
\ No newline at end of file

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=${opensp:location}/lib"
+  OTHERLDFLAGS="-L${opensp:location}/lib -Wl,-rpath,${opensp:location}/lib"

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=${libxml2:location}/lib -Wl,-rpath=${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

component/perl-XML-Parser/buildout.cfg

@@ -24,7 +24,7 @@ configure-command =
 # Parallel make does not work for this package on fast machines
 # with many cores
 make-options =
-  OTHERLDFLAGS=" -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${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

component/perl/buildout.cfg

@@ -28,7 +28,7 @@ configure-command =
     -Dprefix=${buildout:parts-directory}/${:_buildout_section_name_} \
     -Dsiteprefix=${:siteprefix} \
     -Dcflags=-I${gdbm:location}/include \
-    -Dldflags="-L${gdbm:location}/lib -Wl,-rpath=${gdbm:location}/lib" \
+    -Dldflags="-L${gdbm:location}/lib -Wl,-rpath,${gdbm:location}/lib" \
     -Ui_db \
     -Dnoextensions=ODBM_File
 environment =

component/pkgconfig/buildout.cfg

@@ -26,6 +26,6 @@ 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=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${popt:location}/lib -Wl,-rpath=${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
   GLIB_CFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
   GLIB_LIBS=-L${glib:location}/lib -lglib-2.0 -lintl

component/poppler/buildout.cfg

@@ -35,4 +35,4 @@ environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${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
+  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

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=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${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}

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=${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
+  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

component/python-2.6/buildout.cfg

@@ -47,7 +47,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=${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
+  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

component/python-2.7/buildout.cfg

@@ -46,4 +46,4 @@ configure-options =
 
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat: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${libexpat: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=${libexpat: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
+  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat: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,${libexpat: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

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=${zlib:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath,${zlib:location}/lib -L${libuuid:location}/lib -Wl,-rpath,${libuuid:location}/lib

component/shellinabox/buildout.cfg

@@ -25,7 +25,7 @@ url = http://shellinabox.googlecode.com/files/shellinabox-2.10.tar.gz
 md5sum = 0e144910d85d92edc54702ab9c46f032
 environment =
     CFLAGS = -I${zlib:location}/include -I${openssl:location}/include
-    LDFLAGS = -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib
+    LDFLAGS = -L${zlib:location}/lib -Wl,-rpath,${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath,${openssl:location}/lib
     PKG_CONFIG_PATH = ${openssl:location}/lib/pkgconfig/
 patch-binary = ${patch:location}/bin/patch
 patch-options = -p1

component/slapos/buildout.cfg

@@ -50,7 +50,7 @@ allowed-eggs-from-site-packages =
 PATH=${bison:location}/bin:${bzip2:location}/bin:${gettext:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${libxslt:location}/bin:${m4:location}/bin:${ncurses:location}/bin:${openssl:location}/bin:${pkgconfig:location}/bin:${python2.7:location}/bin:${readline:location}/bin:${sqlite3:location}/bin:${swig:location}/bin:${buildout:bin-directory}:$PATH
 CFLAGS=-I${bzip2:location}/include -I${gdbm:location}/include -I${gettext:location}/include -I${glib:location}/include -I${libxml2:location}/include -I${libxslt:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${popt:location}/include -I${readline:location}/include -I${sqlite3:location}/include -I${zlib:location}/include
 CPPFLAGS=${:CFLAGS}
-LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gdbm:location}/lib -Wl,-rpath=${gdbm:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${libxslt:location}/lib -Wl,-rpath=${libxslt:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath,${bzip2:location}/lib -L${gdbm:location}/lib -Wl,-rpath,${gdbm:location}/lib -L${gettext:location}/lib -Wl,-rpath,${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath,${glib:location}/lib -L${libxml2:location}/lib -Wl,-rpath,${libxml2:location}/lib -L${libxslt:location}/lib -Wl,-rpath,${libxslt:location}/lib -L${ncurses:location}/lib -Wl,-rpath,${ncurses:location}/lib -L${openssl:location}/lib -Wl,-rpath,${openssl:location}/lib -L${popt:location}/lib -Wl,-rpath,${popt:location}/lib -L${readline:location}/lib -Wl,-rpath,${readline:location}/lib -L${sqlite3:location}/lib -Wl,-rpath,${sqlite3:location}/lib -L${zlib:location}/lib -Wl,-rpath,${zlib:location}/lib
 PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${popt:location}/lib/pkgconfig:${python2.7:location}/lib/pkconfig:${sqlite3:location}/lib/pkconfig
 LD_LIBRARY_PATH=${bzip2:location}/lib:${gdbm:location}/lib:${gettext:location}/lib:${glib:location}/lib:${libxml2:location}/lib:${libxslt:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${popt:location}/lib:${readline:location}/lib:${sqlite3:location}/lib:${zlib:location}/lib
 

component/sphinx/buildout.cfg

@@ -31,4 +31,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=${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

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=${readline:location}/lib -Wl,-rpath=${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

component/stunnel/buildout.cfg

@@ -26,4 +26,4 @@ configure-options =
   --with-ssl=${openssl:location}
 environment =
   CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-Wl,-rpath,${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath,${zlib:location}/lib

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=${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
+  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

component/tesseract/buildout.cfg

@@ -30,7 +30,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 =-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
+  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

component/tokyocabinet/buildout.cfg

@@ -14,4 +14,4 @@ configure-options =
   --with-bzip=${bzip2:location}
 
 environment =
-  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${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

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=${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=${ncurses:location}/lib
+  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath,${ncurses:location}/lib

component/w3m/buildout.cfg

@@ -44,4 +44,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=${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
+  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

component/xorg/buildout.cfg

@@ -272,7 +272,7 @@ environment =
   LD_LIBRARY_PATH=${xproto:location}/lib/
   LD_RUN_PATH=${xproto:location}/lib/
   CPPFLAGS=-I${xproto:location}/include/ -I${zlib:location}/include
-  LDFLAGS=-L${xproto:location}/lib -Wl,-rpath=${xproto:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib 
+  LDFLAGS=-L${xproto:location}/lib -Wl,-rpath,${xproto:location}/lib -L${zlib:location}/lib -Wl,-rpath,${zlib:location}/lib 
   PATH=${pkgconfig:location}/bin:%(PATH)s
 
 [libXfont]
@@ -283,7 +283,7 @@ environment =
   PKG_CONFIG_PATH=${fontsproto:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${freetype:location}/lib/pkgconfig
   LD_LIBRARY_PATH=${fontsproto:location}/lib:${libfontenc:location}/lib:${xtrans:location}/include/:${xproto:location}/lib/:${freetype:location}/lib
   LD_RUN_PATH=${fontsproto:location}/lib:${libfontenc:location}/lib:${xproto:location}/lib/:${xtrans:location}/include/:${freetype:location}/lib
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libfontenc:location}/lib -Wl,-rpath=${libfontenc:location}/lib 
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath,${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath,${bzip2:location}/lib -L${libfontenc:location}/lib -Wl,-rpath,${libfontenc:location}/lib 
   CPPFLAGS=-I${zlib:location}/include -I${bzip2:location}/include -I${libfontenc:location}/include
   PATH=${pkgconfig:location}/bin:%(PATH)s
 
@@ -345,7 +345,7 @@ environment =
   CPPFLAGS=-I${renderproto:location}/include/ -I${libX11:location}/include/ -I${libxcb:location}/include -I${libXau:location}/include -I${libXdmcp:location}/include -I${xproto:location}/include -I${kbproto:location}/include
   LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib
   LD_RUN_PATH=${render:location}/lib
-  LDFLAGS=-L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libxcb:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${libXau:location}/lib -Wl,-rpath=${libXau:location}/lib -L${libXdmcp:location}/lib -Wl,-rpath=${libXdmcp:location}/lib 
+  LDFLAGS=-L${libX11:location}/lib -Wl,-rpath,${libX11:location}/lib -L${libxcb:location}/lib -Wl,-rpath,${libxcb:location}/lib -L${libXau:location}/lib -Wl,-rpath,${libXau:location}/lib -L${libXdmcp:location}/lib -Wl,-rpath,${libXdmcp:location}/lib 
   PATH=${pkgconfig:location}/bin:%(PATH)s
 
 [libXinerama]
@@ -487,7 +487,7 @@ environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig
   CPPFLAGS=-I${xproto:location}/include -I${libX11:location}/include -I${libxkbfile:location}/include# -I${xfixes:location}/include -I${libXrender:location}/include
-  LDFLAGS=-L${xproto:location}/lib -Wl,-rpath=${xproto:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libxkbfile:location}/lib -Wl,-rpath=${libxkbfile:location}/lib -lX11
+  LDFLAGS=-L${xproto:location}/lib -Wl,-rpath,${xproto:location}/lib -L${libX11:location}/lib -Wl,-rpath,${libX11:location}/lib -L${libxkbfile:location}/lib -Wl,-rpath,${libxkbfile:location}/lib -lX11
 
 [xserver]
 # Adds Xvfb functionnality
@@ -516,4 +516,4 @@ environment =
   PKG_CONFIG_PATH=${pixman:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${fixesproto:location}/lib/pkgconfig:${damageproto:location}/lib/pkgconfig:${xcmiscproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${bigreqsproto:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${randrproto:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${fontsproto:location}/lib/pkgconfig:${videoproto:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig:${resourceproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${libXfont:location}/lib/pkgconfig:${gpg-error:location}/lib/pkgconfig
   CPPFLAGS=-I${xproto:location}/include -I${pixman:location}/include/pixman-1 -I${xextproto:location}/include -I${inputproto:location}/include -I${fontsproto:location}/include -I${kbproto:location}/include -I${xineramaproto:location}/include -I${renderproto:location}/include -I${bigreqsproto:location}/include -I${videoproto:location}/include -I${resourceproto:location}/include -I${xcmiscproto:location}/include -I${xtrans:location}/include -I${libXau:location}/include -I${randrproto:location}/include -I${libxkbfile:location}/include -I${recordproto:location}/include -I${fixesproto:location}/include -I${damageproto:location}/include -I${bzip2:location}/include -I${gcrypt:location}/include -I${zlib:location}/include -I${libfontenc:location}/include -I${gpg-error:location}/include
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  LDFLAGS=-L${gcrypt:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${gcrypt:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libfontenc:location}/lib -Wl,-rpath=${libfontenc:location}/lib -L${libXau:location}/lib -Wl,-rpath=${libXau:location}/lib -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib
+  LDFLAGS=-L${gcrypt:location}/lib -L${bzip2:location}/lib -Wl,-rpath,${gcrypt:location}/lib -Wl,-rpath,${openssl:location}/lib -Wl,-rpath,${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath,${zlib:location}/lib -L${libfontenc:location}/lib -Wl,-rpath,${libfontenc:location}/lib -L${libXau:location}/lib -Wl,-rpath,${libXau:location}/lib -L${gpg-error:location}/lib -Wl,-rpath,${gpg-error:location}/lib

component/xtrabackup/buildout.cfg

@@ -58,7 +58,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-command = ln -sf ${mysql-5.1-download:location}/${mysql-5.1-download:filename} ${libtar-download:location}/${libtar-download:filename} . && 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=${zlib:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -Wl,-rpath=${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

software/pulse/software.cfg

@@ -79,7 +79,7 @@ url = http://jean.parpaillon.free.fr/pulse2/mmc-3.0.2.tar.gz
 #  PATH=${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
+#  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
 
 [pulse2]
 recipe = hexagonit.recipe.cmmi
@@ -90,7 +90,7 @@ url = http://jean.parpaillon.free.fr/pulse2/pulse2-1.3.1-78-gde4801e.tar.gz
 #  PATH=${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
+#  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
 
 [slaposcookbook]
 recipe = plone.recipe.command