From 45e045ddcc5d43265cfe9d1541064d77c8889667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Wed, 10 Nov 2010 16:57:41 +0000 Subject: [PATCH] - extend extends - put compiler flags in environment - use locally provided zlib git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40185 20353a03-c40f-0410-a6d1-a30d3c3de9de --- buildout/software-profiles/sphinx.cfg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/buildout/software-profiles/sphinx.cfg b/buildout/software-profiles/sphinx.cfg index c6c785ee3c..aee9ccf82f 100644 --- a/buildout/software-profiles/sphinx.cfg +++ b/buildout/software-profiles/sphinx.cfg @@ -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 -- 2.30.9