[Erp5-report] r44062 kazuhiko - in /erp5/trunk/buildout: software-profiles/ tests/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Mar  9 09:02:41 2011
New Revision: 44062

URL: http://svn.erp5.org?rev=44062&view=rev
Log:
build bootstrap python-2.7 with our own gettext.

Modified:
    erp5/trunk/buildout/software-profiles/python-2.7.cfg
    erp5/trunk/buildout/tests/assertSoftware.py

Modified: erp5/trunk/buildout/software-profiles/python-2.7.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/python-2.7.cfg?rev=44062&r1=44061&r2=44062&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/python-2.7.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/python-2.7.cfg [utf8] Wed Mar  9 09:02:41 2011
@@ -2,6 +2,7 @@
 extends =
   bzip2.cfg
   gdbm.cfg
+  gettext.cfg
   ncurses.cfg
   openssl.cfg
   readline.cfg
@@ -50,7 +51,5 @@ 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
-  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 -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
-
-
+  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${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 -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 -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=44062&r1=44061&r2=44062&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Wed Mar  9 09:02:41 2011
@@ -2266,6 +2266,7 @@ class AssertPython27(AssertSoftwareMixin
   def test_ld_dyn_locale(self):
     self.assertLibraryList(self.python_path+'/lib/python2.7/lib-dynload/_locale.so', [
       'libc',
+      'libintl',
       'libpthread',
       ], self.rpath_list)
   def test_ld_dyn_readline(self):