[gentoo-commits] gentoo-x86 commit in dev-util/boost-build/files: boost-build-1.50.0-fix-test.patch boost-build-1.50.0-respect-c_ld-flags.patch

[gentoo-commits] gentoo-x86 commit in dev-util/boost-build/files: boost-build-1.50.0-fix-test.patch boost-build-1.50.0-respect-c_ld-flags.patch

[Tiziano Mueller (dev-zero)]

dev-zero    12/08/19 18:22:31

  Added:                boost-build-1.50.0-fix-test.patch
                        boost-build-1.50.0-respect-c_ld-flags.patch
  Log:
  Fix tests. Fix installation of boost-build python-rewrite and optimize/cleanup installed .py files (bug #324375). Rechecked build regarding LDFLAGS (bug #334467), replaced workaround with a patch and added verbosity flag to the bjam-call.
  
  (Portage version: 2.1.11.9/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-util/boost-build/files/boost-build-1.50.0-fix-test.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/boost-build/files/boost-build-1.50.0-fix-test.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/boost-build/files/boost-build-1.50.0-fix-test.patch?rev=1.1&content-type=text/plain

Index: boost-build-1.50.0-fix-test.patch
===================================================================
--- test/startup_v2.py.orig	2012-08-19 11:48:12.020600368 +0200
+++ test/startup_v2.py	2012-08-19 11:48:28.564516623 +0200
@@ -14,7 +14,7 @@
     return re.match(expected,actual,re.DOTALL) != None
 
 # Test the v1 startup behavior.
-t = BoostBuild.Tester(match=match_re, boost_build_path='', pass_toolset=0)
+t = BoostBuild.Tester(match=match_re, boost_build_path='/invalid/location', pass_toolset=0)
 
 t.set_tree('startup')
 



1.1                  dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch?rev=1.1&content-type=text/plain

Index: boost-build-1.50.0-respect-c_ld-flags.patch
===================================================================
--- engine/build.jam.orig	2012-08-19 09:47:23.916383518 +0200
+++ engine/build.jam	2012-08-19 09:53:38.011554690 +0200
@@ -179,10 +179,10 @@
 if ! $(CC) { CC = cc ; }
 toolset cc $(CC) : "-o " : -D
     : $(CFLAGS)
-    [ opt --release : -s -O ]
+    [ opt --release : ]
     [ opt --debug : -g ]
     -I$(--python-include) -I$(--extra-include)
-    : $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ;
+    : $(LDFLAGS) $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ;
 ## Comeau C/C++ 4.x
 toolset como como : "-o " : -D
     : --c
@@ -201,11 +201,11 @@
 ## MacOSX Darwin, using GCC 2.9.x, 3.x
 toolset darwin cc :  "-o " : -D
     :
-    [ opt --release : -Wl,-x -O3 -finline-functions ]
+    [ opt --release : -Wl,-x -finline-functions ]
     [ opt --debug : -g -O0 -fno-inline -pg ]
     [ opt --profile : -Wl,-x -O3 -finline-functions -g -pg ]
     -I$(--python-include) -I$(--extra-include)
-    : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
+    : $(LDFLAGS) -L$(--python-lib[1]) -l$(--python-lib[2]) ;
 ## GCC 2.x, 3.x, 4.x
 toolset gcc gcc : "-o " : -D
     : -pedantic -fno-strict-aliasing
--- engine/build.sh.orig	2012-08-19 12:09:56.400780866 +0200
+++ engine/build.sh	2012-08-19 12:10:49.728499203 +0200
@@ -224,9 +224,9 @@
     cc)
     if test -z "$CC" ; then CC=cc ; fi
     BOOST_JAM_CC=$CC
-    BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LIBS"
-    BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LIBS"
-    BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LIBS"
+    BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LDFLAGS $LIBS"
+    BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LDFLAGS $LIBS"
+    BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LDFLAGS $LIBS"
     ;;
 
     qcc)