[pkg-boost-commits] r14328 - boost/branches/1.36.0/debian

[smr at alioth.debian.org]

Author: smr
Date: 2008-11-15 16:51:05 +0000 (Sat, 15 Nov 2008)
New Revision: 14328

Modified:
   boost/branches/1.36.0/debian/changelog
   boost/branches/1.36.0/debian/rules
Log:
Exclude math_c99l and math_tr1l from debhelper .install files 
when --disable-long-double is applied.



Modified: boost/branches/1.36.0/debian/changelog
===================================================================
--- boost/branches/1.36.0/debian/changelog	2008-11-15 07:05:44 UTC (rev 14327)
+++ boost/branches/1.36.0/debian/changelog	2008-11-15 16:51:05 UTC (rev 14328)
@@ -2,8 +2,11 @@
 
   * patches/atomic_count_gcc.patch: New.  GCC version >= 4.2 has moved
     <bits/atomic.h> to <ext/atomic.h>.
+  
+  * rules: Exclude math_c99l and math_tr1l from debhelper .install files
+    when --disable-long-double is applied.
 
- -- Steve M. Robbins <smr at debian.org>  Sat, 15 Nov 2008 01:03:05 -0600
+ -- Steve M. Robbins <smr at debian.org>  Sat, 15 Nov 2008 10:10:50 -0600
 
 boost1.36 (1.36.0-6) unstable; urgency=low
 

Modified: boost/branches/1.36.0/debian/rules
===================================================================
--- boost/branches/1.36.0/debian/rules	2008-11-15 07:05:44 UTC (rev 14327)
+++ boost/branches/1.36.0/debian/rules	2008-11-15 16:51:05 UTC (rev 14328)
@@ -26,7 +26,8 @@
 boost_libs := date-time filesystem graph iostreams math program-options python regex serialization signals system test 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
 
@@ -129,24 +130,32 @@
 		) \
 	)
 
+BUILD_LONG_DOUBLE = yes
+
 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
+BUILD_LONG_DOUBLE = no
 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
+BUILD_LONG_DOUBLE = no
 else ifeq ($(DEB_BUILD_ARCH), armel)
 TOOLSET_CONFIG="using gcc : : : <compileflags>-D_REENTRANT <compileflags>-DBOOST_SP_USE_PTHREADS ;"
-JAM_OPT = --disable-long-double
+BUILD_LONG_DOUBLE = no
 else ifeq ($(DEB_BUILD_ARCH), mips)
-JAM_OPT = --disable-long-double
+BUILD_LONG_DOUBLE = no
 else ifeq ($(DEB_BUILD_ARCH), mipsel)
-JAM_OPT = --disable-long-double
+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 ;"