Logoj0ke.net Open Build Service > Projects > server:monitoring:branches:gearman:1.0.1 > boost-jam > boost-jam-jam0_use_passed_cflags.diff
Sign Up | Log In

File boost-jam-jam0_use_passed_cflags.diff of Package boost-jam

x
 
1
diff -rup boost-jam-3.1.18.orig/build.jam boost-jam-3.1.18/build.jam
2
--- boost-jam-3.1.18.orig/build.jam 2010-04-02 22:41:15.059100821 +0200
3
+++ boost-jam-3.1.18/build.jam  2010-04-02 23:35:18.563541541 +0200
4
@@ -204,7 +204,7 @@ toolset darwin cc :  "-o " : -D
5
 ## GCC 2.x, 3.x, 4.x
6
 toolset gcc gcc : "-o " : -D
7
     : -pedantic -fno-strict-aliasing
8
-    [ opt --release : [ opt --symbols : -g : -s ] -O3 ]
9
+    [ opt --release : [ opt --symbols : -g : -s ] $(CFLAGS) ]
10
     [ opt --debug : -g -O0 -fno-inline ]
11
     -I$(--python-include) -I$(--extra-include) -Wno-long-long
12
     : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
13
diff -rup boost-jam-3.1.18.orig/build.sh boost-jam-3.1.18/build.sh
14
--- boost-jam-3.1.18.orig/build.sh  2010-04-02 22:41:15.038698714 +0200
15
+++ boost-jam-3.1.18/build.sh   2010-04-02 23:39:04.663101117 +0200
16
@@ -12,7 +12,7 @@ BOOST_JAM_TOOLSET=
17
 echo_run ()
18
 {
19
     echo "$@"
20
-    $@
21
+    eval "$@"
22
     r=$?
23
     if test $r -ne 0 ; then
24
         exit $r
25
@@ -290,5 +290,9 @@ if test -x "./bootstrap/jam0" ; then
26
     if test "${BJAM_UPDATE}" != "update" ; then
27
         echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" clean
28
     fi
29
-    echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@"
30
+    if test -z "$BOOST_JAM_TOOLSET_ROOT"; then
31
+        echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "$@"
32
+    else
33
+        echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@"
34
+    fi
35
 fi
36