[Erp5-report] r40185 luke - /erp5/trunk/buildout/software-profiles/sphinx.cfg

[nobody at svn.erp5.org]

Author: luke
Date: Wed Nov 10 17:57:41 2010
New Revision: 40185

URL: http://svn.erp5.org?rev=40185&view=rev
Log:
 - extend extends
 - put compiler flags in environment
 - use locally provided zlib

Modified:
    erp5/trunk/buildout/software-profiles/sphinx.cfg

Modified: erp5/trunk/buildout/software-profiles/sphinx.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/sphinx.cfg?rev=40185&r1=40184&r2=40185&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/sphinx.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/sphinx.cfg [utf8] Wed Nov 10 17:57:41 2010
@@ -1,5 +1,8 @@
 [buildout]
 parts = sphinx
+extends =
+  ../software-profiles/mysql-5.1.cfg
+  ../software-profiles/zlib.cfg
 
 [sphinx-1.10-fix_nosigpipe.patch]
 recipe = hexagonit.recipe.download
@@ -25,9 +28,10 @@ configure-options =
   --with-mysql-includes=${mysql-5.1:location}/include/mysql
   --with-mysql-libs=${mysql-5.1:location}/lib/mysql
   --with-libstemmer
-  LDFLAGS="-Wl,-rpath ${mysql-5.1:location}/lib/mysql"
 patch-options = -p1
 patches =
   ${sphinx-1.10-fix_nosigpipe.patch:location}/${sphinx-1.10-fix_nosigpipe.patch:filename}
   ${sphinx-1.10-beta-snowball.patch:location}/${sphinx-1.10-beta-snowball.patch:filename}
 environment =
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath ${mysql-5.1:location}/lib/mysql