[pkg-boost-commits] r14317 - in boost/branches/1.36.0/debian: . patches

[smr at alioth.debian.org]

Author: smr
Date: 2008-11-12 03:34:34 +0000 (Wed, 12 Nov 2008)
New Revision: 14317

Added:
   boost/branches/1.36.0/debian/patches/add-disable-long-double.patch
Modified:
   boost/branches/1.36.0/debian/changelog
   boost/branches/1.36.0/debian/patches/series
   boost/branches/1.36.0/debian/rules
Log:
Disable generation of long double libraries for arm, armel, hppa, mips, and mipsel; avoids build failures.

Modified: boost/branches/1.36.0/debian/changelog
===================================================================
--- boost/branches/1.36.0/debian/changelog	2008-11-12 00:40:51 UTC (rev 14316)
+++ boost/branches/1.36.0/debian/changelog	2008-11-12 03:34:34 UTC (rev 14317)
@@ -8,7 +8,15 @@
     BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS for arm, armel, mips, and
     mipsel, as they all seem to have no log1pl() function.
   
- -- Steve M. Robbins <smr at debian.org>  Tue, 11 Nov 2008 14:59:07 -0600
+  * patches/add-disable-long-double.patch: New.  Add option
+    --disable-long-double which, if specified on the bjam command line,
+    omits the TR1 and C99 long double libraries.  If not specified but
+    BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS is defined, we end up with a
+    build failure.
+  * rules: Add --disable-long-double for architectures arm, armel, hppa,
+    mips, and mipsel.
+  
+ -- Steve M. Robbins <smr at debian.org>  Tue, 11 Nov 2008 21:31:35 -0600
 
 boost1.36 (1.36.0-3) unstable; urgency=low
 

Added: boost/branches/1.36.0/debian/patches/add-disable-long-double.patch
===================================================================
--- boost/branches/1.36.0/debian/patches/add-disable-long-double.patch	                        (rev 0)
+++ boost/branches/1.36.0/debian/patches/add-disable-long-double.patch	2008-11-12 03:34:34 UTC (rev 14317)
@@ -0,0 +1,61 @@
+Add option --disable-long-double to Boost build procedure.
+Specifying this option essentially allows us to ignore
+a build failure.
+
+c.f. http://lists.boost.org/boost-build/2008/11/20683.php
+
+
+--- boost1.36-1.36.0.orig/libs/math/build/Jamfile.v2
++++ boost1.36-1.36.0/libs/math/build/Jamfile.v2
+@@ -51,7 +51,18 @@
+ sph_neumann
+ ;
+ 
+-compile has_long_double_support.cpp ;
++if --disable-long-double in [ modules.peek : ARGV ]
++{
++    build-long-double = false ;
++}
++else
++{
++    build-long-double = true ;
++    compile has_long_double_support.cpp ;
++}
++
++ECHO "Build long double: " $(build-long-double) ;
++
+ 
+ lib boost_math_tr1 : ../src/tr1/$(TR1_SOURCES).cpp
+     :         
+@@ -63,11 +74,15 @@
+  	     <link>shared:<define>BOOST_MATH_TR1_DYN_LINK=1
+    ;
+ 
++if $(build-long-double) = true
++{
++echo "BUILDING MATH_TR1 LONG" ;
+ lib boost_math_tr1l : ../src/tr1/$(TR1_SOURCES)l.cpp
+     :         
+  	     <link>shared:<define>BOOST_MATH_TR1_DYN_LINK=1
+  	     <dependency>has_long_double_support
+    ;
++}
+ 
+ lib boost_math_c99 : ../src/tr1/$(C99_SOURCES).cpp
+     :         
+@@ -79,11 +94,15 @@
+  	     <link>shared:<define>BOOST_MATH_TR1_DYN_LINK=1
+    ;
+ 
++if $(build-long-double) = true
++{
++echo "BUILDING MATH_C99 LONG" ;
+ lib boost_math_c99l : ../src/tr1/$(C99_SOURCES)l.cpp
+     :         
+  	     <link>shared:<define>BOOST_MATH_TR1_DYN_LINK=1
+  	     <dependency>has_long_double_support
+    ;
++}
+ 
+ 
+ boost-install boost_math_c99 boost_math_c99f boost_math_c99l boost_math_tr1 boost_math_tr1f boost_math_tr1l ;

Modified: boost/branches/1.36.0/debian/patches/series
===================================================================
--- boost/branches/1.36.0/debian/patches/series	2008-11-12 00:40:51 UTC (rev 14316)
+++ boost/branches/1.36.0/debian/patches/series	2008-11-12 03:34:34 UTC (rev 14317)
@@ -1,3 +1,4 @@
+add-disable-long-double.patch
 math_tools_config.patch
 atomic_count.patch
 endian.patch

Modified: boost/branches/1.36.0/debian/rules
===================================================================
--- boost/branches/1.36.0/debian/rules	2008-11-12 00:40:51 UTC (rev 14316)
+++ boost/branches/1.36.0/debian/rules	2008-11-12 03:34:34 UTC (rev 14317)
@@ -132,12 +132,19 @@
 TOOLSET_CONFIG="using gcc : : : <compileflags>-D_REENTRANT ;"
 ifeq ($(DEB_BUILD_ARCH), hppa)
 TOOLSET_CONFIG="using gcc : : : <compileflags>-D_REENTRANT <compileflags>-mlong-calls <compileflags>-DBOOST_SP_USE_PTHREADS ;"
+JAM_OPT = --disable-long-double
 else ifeq ($(DEB_BUILD_ARCH), sparc)
 TOOLSET_CONFIG="using gcc : : : <compileflags>-D_REENTRANT <compileflags>-DBOOST_SP_USE_PTHREADS ;"
 else ifeq ($(DEB_BUILD_ARCH), arm)
 TOOLSET_CONFIG="using gcc : : : <compileflags>-D_REENTRANT <compileflags>-DBOOST_SP_USE_PTHREADS ;"
+JAM_OPT = --disable-long-double
 else ifeq ($(DEB_BUILD_ARCH), armel)
 TOOLSET_CONFIG="using gcc : : : <compileflags>-D_REENTRANT <compileflags>-DBOOST_SP_USE_PTHREADS ;"
+JAM_OPT = --disable-long-double
+else ifeq ($(DEB_BUILD_ARCH), mips)
+JAM_OPT = --disable-long-double
+else ifeq ($(DEB_BUILD_ARCH), mipsel)
+JAM_OPT = --disable-long-double
 endif
 
 PYTHON_CONFIG1 = "using python : 2.4 : /usr ;"
@@ -149,7 +156,7 @@
 bjam = $(CURDIR)/tools/jam/src/bjam
 
 # FIXME: find a flag to disable reading /etc/site-config.jam
-JAM = $(bjam) $(JOBS) -d2 --user-config=$(CURDIR)/user-config.jam -sHAVE_ICU=1 debug-symbols=on
+JAM = $(bjam) $(JOBS) -d2 $(JAM_OPT) --user-config=$(CURDIR)/user-config.jam -sHAVE_ICU=1 debug-symbols=on
 jam_variants = variant=release,debug threading=single,multi link=shared,static
 
 $(bjam):