[Erp5-report] r40962 kazuhiko - /erp5/trunk/buildout/software-profiles/

nobody at svn.erp5.org nobody at svn.erp5.org
Wed Dec 1 15:22:48 CET 2010 

Author: kazuhiko
Date: Wed Dec  1 15:22:48 2010
New Revision: 40962

URL: http://svn.erp5.org?rev=40962&view=rev
Log:
use our own pkg-config.

Modified:
    erp5/trunk/buildout/software-profiles/ghostscript.cfg
    erp5/trunk/buildout/software-profiles/libxslt.cfg
    erp5/trunk/buildout/software-profiles/mroonga.cfg
    erp5/trunk/buildout/software-profiles/neon.cfg
    erp5/trunk/buildout/software-profiles/subversion.cfg
    erp5/trunk/buildout/software-profiles/varnish.cfg
    erp5/trunk/buildout/software-profiles/w3m.cfg

Modified: erp5/trunk/buildout/software-profiles/ghostscript.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/ghostscript.cfg?rev=40962&r1=40961&r2=40962&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/ghostscript.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/ghostscript.cfg [utf8] Wed Dec  1 15:22:48 2010
@@ -3,6 +3,7 @@ extends =
   ../software-profiles/fontconfig.cfg
   ../software-profiles/libjpeg.cfg
   ../software-profiles/libtiff.cfg
+  ../software-profiles/pkgconfig.cfg
 
 parts = ghostscript
 
@@ -24,7 +25,8 @@ configure-options =
 # it seems that parallel build sometimes fails for ghostscript.
 make-options = -j1
 environment =
-  PKG_CONFIG_PATH =${fontconfig:location}/lib/pkgconfig
+  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
 

Modified: erp5/trunk/buildout/software-profiles/libxslt.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/libxslt.cfg?rev=40962&r1=40961&r2=40962&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/libxslt.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/libxslt.cfg [utf8] Wed Dec  1 15:22:48 2010
@@ -1,6 +1,7 @@
 [buildout]
 extends =
   ../software-profiles/libxml2.cfg
+  ../software-profiles/pkgconfig.cfg
   ../software-profiles/zlib.cfg
 
 parts =
@@ -15,6 +16,7 @@ configure-options =
   --without-crypto
   --without-python
 environment =
-  CPPFLAGS =-I${zlib:location}/include
-  LDFLAGS =-Wl,-rpath -Wl,${zlib:location}/lib
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-Wl,-rpath -Wl,${zlib:location}/lib
   PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig

Modified: erp5/trunk/buildout/software-profiles/mroonga.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/mroonga.cfg?rev=40962&r1=40961&r2=40962&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/mroonga.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/mroonga.cfg [utf8] Wed Dec  1 15:22:48 2010
@@ -5,6 +5,9 @@
 [buildout]
 parts =
   mroonga
+extends =
+  ../software-profiles/mysql-5.1.cfg
+  ../software-profiles/pkgconfig.cfg
 
 [groonga]
 recipe = hexagonit.recipe.cmmi
@@ -21,8 +24,8 @@ configure-options =
   --with-mysql-source=${mysql-5.1:location}__compile__/mysql-${mysql-5.1:version}
   --with-mysql-config=${mysql-5.1:location}/bin/mysql_config
 environment =
-    PATH =${groonga:location}/bin:%(PATH)s
-    CFLAGS =-I${groonga:location}/include/groonga
-    CXXFLAGS =-I${groonga:location}/include/groonga
-    LDFLAGS =-L${groonga:location}/lib
-    PKG_CONFIG_PATH =${groonga:location}/lib/pkgconfig
+    PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+    CFLAGS=-I${groonga:location}/include/groonga
+    CXXFLAGS=-I${groonga:location}/include/groonga
+    LDFLAGS=-L${groonga:location}/lib
+    PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig

Modified: erp5/trunk/buildout/software-profiles/neon.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/neon.cfg?rev=40962&r1=40961&r2=40962&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/neon.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/neon.cfg [utf8] Wed Dec  1 15:22:48 2010
@@ -4,6 +4,7 @@ parts =
 extends =
   ../software-profiles/libxml2.cfg
   ../software-profiles/openssl.cfg
+  ../software-profiles/pkgconfig.cfg
   ../software-profiles/zlib.cfg
 
 [neon]
@@ -19,7 +20,7 @@ configure-options =
   --enable-threadsafe-ssl=posix
 
 environment =
-  PATH=${libxml2:location}/bin:%(PATH)s
+  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

Modified: erp5/trunk/buildout/software-profiles/subversion.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/subversion.cfg?rev=40962&r1=40961&r2=40962&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/subversion.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/subversion.cfg [utf8] Wed Dec  1 15:22:48 2010
@@ -6,10 +6,11 @@ extends =
   ../software-profiles/apache.cfg
   ../software-profiles/libdb.cfg
   ../software-profiles/libexpat.cfg
+  ../software-profiles/libuuid.cfg
+  ../software-profiles/neon.cfg
+  ../software-profiles/pkgconfig.cfg
   ../software-profiles/sqlite3.cfg
   ../software-profiles/zlib.cfg
-  ../software-profiles/neon.cfg
-  ../software-profiles/libuuid.cfg
 parts =
   subversion
 
@@ -52,6 +53,7 @@ make-options =
   -j1
 
 environment =
+  PATH=${pkgconfig: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

Modified: erp5/trunk/buildout/software-profiles/varnish.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/varnish.cfg?rev=40962&r1=40961&r2=40962&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/varnish.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/varnish.cfg [utf8] Wed Dec  1 15:22:48 2010
@@ -8,8 +8,9 @@ parts =
 
 extends =
   ../software-profiles/ncurses.cfg
-  ../software-profiles/pcre.cfg
   ../software-profiles/patch.cfg
+  ../software-profiles/pcre.cfg
+  ../software-profiles/pkgconfig.cfg
 
 [varnish]
 <= varnish-2.0
@@ -38,7 +39,7 @@ patch-options = -p4
 patches =
   ${varnish-2.1.4-r5467-patch:location}/${varnish-2.1.4-r5467-patch:filename}
 environment =
-  PATH=${patch:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${pcre:location}/lib/pkgconfig
   CPPFLAGS =-I${ncurses:location}/include
   LDFLAGS =-Wl,-rpath -Wl,${ncurses:location}/lib

Modified: erp5/trunk/buildout/software-profiles/w3m.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/w3m.cfg?rev=40962&r1=40961&r2=40962&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/w3m.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/w3m.cfg [utf8] Wed Dec  1 15:22:48 2010
@@ -3,6 +3,7 @@ extends =
   ../software-profiles/garbage-collector.cfg
   ../software-profiles/ncurses.cfg
   ../software-profiles/openssl.cfg
+  ../software-profiles/pkgconfig.cfg
   ../software-profiles/zlib.cfg
 
 parts =
@@ -27,7 +28,7 @@ configure-options =
   --disable-w3mmailer
 
 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
-a=a
\ No newline at end of file
+  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

More information about the Erp5-report mailing list