[Erp5-report] r40531 luke - /erp5/trunk/buildout/software-profiles/

[nobody at svn.erp5.org]

Author: luke
Date: Tue Nov 23 12:06:25 2010
New Revision: 40531

URL: http://svn.erp5.org?rev=40531&view=rev
Log:
 - use own gettext for python2.6 compilation
 - compile gettext in safe way

Modified:
    erp5/trunk/buildout/software-profiles/gettext.cfg
    erp5/trunk/buildout/software-profiles/python-2.6.cfg

Modified: erp5/trunk/buildout/software-profiles/gettext.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/gettext.cfg?rev=40531&r1=40530&r2=40531&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/gettext.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/gettext.cfg [utf8] Tue Nov 23 12:06:25 2010
@@ -3,7 +3,7 @@ parts =
   gettext
 
 [gettext]
-recipe = hexagonit.recipe.cmmi
+recipe = erp5.recipe.cmmisafe
 url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz
 md5sum = 3dd55b952826d2b32f51308f2f91aa89
 configure-options =

Modified: erp5/trunk/buildout/software-profiles/python-2.6.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/python-2.6.cfg?rev=40531&r1=40530&r2=40531&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/python-2.6.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/python-2.6.cfg [utf8] Tue Nov 23 12:06:25 2010
@@ -2,6 +2,7 @@
 extends =
   ../software-profiles/bzip2.cfg
   ../software-profiles/gdbm.cfg
+  ../software-profiles/gettext.cfg
   ../software-profiles/libdb.cfg
   ../software-profiles/ncurses.cfg
   ../software-profiles/openssl.cfg
@@ -31,8 +32,8 @@ configure-options =
   --with-threads
 
 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${libdb: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 -L${libdb:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${gdbm:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -Wl,-rpath -Wl,${libdb:location}/lib
+  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${libdb: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 -L${libdb:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${gdbm:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -Wl,-rpath -Wl,${libdb:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib
 
 [bootstrap2.6]
 <= bootstrap