[pkg-boost-commits] r14358 - in boost/trunk/debian: . patches

[smr at alioth.debian.org]

Author: smr
Date: 2008-12-19 03:14:43 +0000 (Fri, 19 Dec 2008)
New Revision: 14358

Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
   boost/trunk/debian/rules
Log:
Change build rules to disable long-double math libraries on hppa, arm, armel, mips, and mipsel.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2008-12-17 06:10:30 UTC (rev 14357)
+++ boost/trunk/debian/changelog	2008-12-19 03:14:43 UTC (rev 14358)
@@ -1,3 +1,11 @@
+boost1.37 (1.37.0-3) unstable; urgency=low
+
+  * patches/series: Add add-disable-long-double.patch to the series.
+  * rules: Suppress building long-double math libraries (math_c99l &
+    math_tr1l) on hppa, arm, armel, mips, and mipsel.  Closes: #508962.
+
+ -- Steve M. Robbins <smr at debian.org>  Thu, 18 Dec 2008 21:11:51 -0600
+
 boost1.37 (1.37.0-2) unstable; urgency=low
 
   * control: Add Bcs-Browser and Vcs-Svn information.

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2008-12-17 06:10:30 UTC (rev 14357)
+++ boost/trunk/debian/patches/series	2008-12-19 03:14:43 UTC (rev 14358)
@@ -14,3 +14,4 @@
 gcc43-path_name_check.patch
 date_time_date_formatting_hpp.patch
 system-error-code.patch
+add-disable-long-double.patch

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2008-12-17 06:10:30 UTC (rev 14357)
+++ boost/trunk/debian/rules	2008-12-19 03:14:43 UTC (rev 14358)
@@ -27,7 +27,8 @@
 	thread wave
 
 # these are special cases, where shared library has not the same name of the Boost library
-boost_lib_math := math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l
+boost_lib_math := math_c99 math_c99f math_tr1 math_tr1f
+boost_lib_math_long_double := math_c99l math_tr1l
 boost_lib_serialization := serialization wserialization
 boost_lib_test := prg_exec_monitor unit_test_framework
 
@@ -128,11 +129,27 @@
 	)
 
 TOOLSET_CONFIG="using gcc : : : <compileflags>-D_REENTRANT ;"
+BUILD_LONG_DOUBLE = yes
 
 ifeq ($(DEB_BUILD_ARCH), hppa)
 TOOLSET_CONFIG="using gcc : : : <compileflags>-D_REENTRANT <compileflags>-mlong-calls <compileflags>-DBOOST_SP_USE_PTHREADS ;"
+BUILD_LONG_DOUBLE = no
+else ifeq ($(DEB_BUILD_ARCH), arm)
+BUILD_LONG_DOUBLE = no
+else ifeq ($(DEB_BUILD_ARCH), armel)
+BUILD_LONG_DOUBLE = no
+else ifeq ($(DEB_BUILD_ARCH), mips)
+BUILD_LONG_DOUBLE = no
+else ifeq ($(DEB_BUILD_ARCH), mipsel)
+BUILD_LONG_DOUBLE = no
 endif
 
+ifeq ($(BUILD_LONG_DOUBLE), yes)
+boost_lib_math += $(boost_lib_math_long_double)
+else
+JAM_OPT += --disable-long-double
+endif
+
 PYTHON_CONFIG1 = "using python : 2.4 : /usr ;"
 PYTHON_CONFIG2 = "using python : 2.5 : /usr ;"
 
@@ -142,7 +159,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=multi link=shared,static
 
 $(bjam):