Fix libs from referencing BPL when there is no python configured.

grafikrobot · grafikrobot · commit 1e315242ce66 · 2017-03-03T22:28:22.000-06:00
diff --git a/build/Jamfile b/build/Jamfile
@@ -42,8 +42,11 @@ rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { retu
 rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }
 local rule eq ( a : b ) { if $(a) = $(b) { return 1 ; } }
 
-lib_boost_python($(py2-version)) = boost_python ;
-lib_boost_python($(py3-version)) = boost_python3 ;
+lib_boost_python(2) = boost_python ;
+lib_boost_python(3) = boost_python3 ;
+
+lib_boost_python($(py2-version)) = $(lib_boost_python(2)) ;
+lib_boost_python($(py3-version)) = $(lib_boost_python(3)) ;
 
 rule lib_boost_python ( version )
 {
@@ -169,6 +172,10 @@ for local N in 2 3
             libraries += $(lib_boost_numpy($(py$(N)-version))) ;
         }
     }
+    else
+    {
+        alias $(lib_boost_python($(N))) ;
+    }
 }
 
 boost-install $(libraries) ;

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,11 @@ rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { retu`
`42`	`42`	`rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }`
`43`	`43`	`local rule eq ( a : b ) { if $(a) = $(b) { return 1 ; } }`
`44`	`44`
`45`		`-lib_boost_python($(py2-version)) = boost_python ;`
`46`		`-lib_boost_python($(py3-version)) = boost_python3 ;`
	`45`	`+lib_boost_python(2) = boost_python ;`
	`46`	`+lib_boost_python(3) = boost_python3 ;`
	`47`	`+`
	`48`	`+lib_boost_python($(py2-version)) = $(lib_boost_python(2)) ;`
	`49`	`+lib_boost_python($(py3-version)) = $(lib_boost_python(3)) ;`
`47`	`50`
`48`	`51`	`rule lib_boost_python ( version )`
`49`	`52`	`{`
`@@ -169,6 +172,10 @@ for local N in 2 3`
`169`	`172`	`libraries += $(lib_boost_numpy($(py$(N)-version))) ;`
`170`	`173`	`}`
`171`	`174`	`}`
	`175`	`+ else`
	`176`	`+ {`
	`177`	`+ alias $(lib_boost_python($(N))) ;`
	`178`	`+ }`
`172`	`179`	`}`
`173`	`180`
`174`	`181`	`boost-install $(libraries) ;`