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

nobody at svn.erp5.org nobody at svn.erp5.org
Fri Nov 26 20:42:41 CET 2010


Author: kazuhiko
Date: Fri Nov 26 20:42:40 2010
New Revision: 40811

URL: http://svn.erp5.org?rev=40811&view=rev
Log:
* use dynamic linking to get stable results on various environments.
* remove LDCONFIG= that just does not work as expected.

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

Modified: erp5/trunk/buildout/software-profiles/ncurses.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/ncurses.cfg?rev=40811&r1=40810&r2=40811&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/ncurses.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/ncurses.cfg [utf8] Fri Nov 26 20:42:40 2010
@@ -14,9 +14,8 @@ configure-options =
   --with-normal
   --without-debug
   --enable-rpath
-# no need to call ldconfig
-make-options =
-  LDCONFIG=
 # tricky way to rerun with --enable-widec
 make-targets =
   install && ./configure ${:configure-options} --enable-widec && make install
+environment =
+  LDFLAGS =-Wl,--as-needed

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=40811&r1=40810&r2=40811&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Fri Nov 26 20:42:40 2010
@@ -1383,12 +1383,14 @@ class AssertNcurses(AssertSoftwareMixin)
   def test_ld_ncurses(self):
     self.assertLibraryList('parts/ncurses/lib/libncurses.so', [
       'libc',
+      'libdl',
       ], [
       'ncurses',
       ])
   def test_ld_ncursesw(self):
     self.assertLibraryList('parts/ncurses/lib/libncursesw.so', [
       'libc',
+      'libdl',
       ], [
       'ncurses',
       ])




More information about the Erp5-report mailing list