[Erp5-report] r41882 kazuhiko - /erp5/trunk/buildout/software-profiles/
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Dec 30 15:48:55 CET 2010
Author: kazuhiko
Date: Thu Dec 30 15:48:55 2010
New Revision: 41882
URL: http://svn.erp5.org?rev=41882&view=rev
Log:
* use CPPFLAGS instead of CFLAGS for specifying header locations.
* disable X11/OpenGL for libtiff and jasper.
Modified:
erp5/trunk/buildout/software-profiles/fontconfig.cfg
erp5/trunk/buildout/software-profiles/freetype.cfg
erp5/trunk/buildout/software-profiles/glib.cfg
erp5/trunk/buildout/software-profiles/graphviz.cfg
erp5/trunk/buildout/software-profiles/jasper.cfg
erp5/trunk/buildout/software-profiles/libtiff.cfg
Modified: erp5/trunk/buildout/software-profiles/fontconfig.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/fontconfig.cfg?rev=41882&r1=41881&r2=41882&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/fontconfig.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/fontconfig.cfg [utf8] Thu Dec 30 15:48:55 2010
@@ -18,5 +18,5 @@ configure-options =
--with-expat=${libexpat:location}
--with-freetype-config=${freetype:location}/bin/freetype-config
environment =
- CFLAGS=-I${zlib:location}/include
+ CPPFLAGS=-I${zlib:location}/include
LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
Modified: erp5/trunk/buildout/software-profiles/freetype.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/freetype.cfg?rev=41882&r1=41881&r2=41882&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/freetype.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/freetype.cfg [utf8] Thu Dec 30 15:48:55 2010
@@ -13,5 +13,5 @@ recipe = hexagonit.recipe.cmmi
url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.4.tar.gz
md5sum = 9273efacffb683483e58a9e113efae9f
environment =
- CFLAGS=-I${zlib:location}/include
+ CPPFLAGS=-I${zlib:location}/include
LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
Modified: erp5/trunk/buildout/software-profiles/glib.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/glib.cfg?rev=41882&r1=41881&r2=41882&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/glib.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/glib.cfg [utf8] Thu Dec 30 15:48:55 2010
@@ -13,6 +13,6 @@ configure-options =
--disable-xattr
environment =
- CFLAGS=-I${zlib:location}/include -I${gettext:location}/include
+ 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
PATH=${gettext:location}/bin:%(PATH)s
Modified: erp5/trunk/buildout/software-profiles/graphviz.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/graphviz.cfg?rev=41882&r1=41881&r2=41882&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/graphviz.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/graphviz.cfg [utf8] Thu Dec 30 15:48:55 2010
@@ -52,5 +52,5 @@ configure-options =
environment =
PATH=${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig
- CFLAGS =-I${zlib:location}/include
- LDFLAGS =-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
+ CPPFLAGS=-I${zlib:location}/include
+ LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
Modified: erp5/trunk/buildout/software-profiles/jasper.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/jasper.cfg?rev=41882&r1=41881&r2=41882&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/jasper.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/jasper.cfg [utf8] Thu Dec 30 15:48:55 2010
@@ -10,7 +10,7 @@ url = http://www.ece.uvic.ca/~mdadams/ja
md5sum = a342b2b4495b3e1394e161eb5d85d754
# jasper configure script is not executable by default
configure-command =
- /bin/sh ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --enable-shared
+ /bin/sh ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --enable-shared --disable-opengl
environment =
- CFLAGS=-I${libjpeg:location}/include
+ CPPFLAGS=-I${libjpeg:location}/include
LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath -Wl,${libjpeg:location}/lib
Modified: erp5/trunk/buildout/software-profiles/libtiff.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/libtiff.cfg?rev=41882&r1=41881&r2=41882&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/libtiff.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/libtiff.cfg [utf8] Thu Dec 30 15:48:55 2010
@@ -11,7 +11,8 @@ parts =
recipe = hexagonit.recipe.cmmi
url = http://download.osgeo.org/libtiff/tiff-3.9.4.tar.gz
md5sum = 2006c1bdd12644dbf02956955175afd6
-
+configure-options =
+ --without-x
environment =
- CFLAGS=-I${libjpeg:location}/include -I${jbigkit:location}/include -I${zlib:location}/include
+ 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
More information about the Erp5-report
mailing list