[pkg-boost-commits] r14751 - boost/trunk/debian

[Steven Michael Robbins]

Author: smr
Date: 2013-03-20 06:23:01 +0000 (Wed, 20 Mar 2013)
New Revision: 14751

Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/rules
Log:
Do not build Boost.Context on unsupported arches.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2013-03-20 05:27:03 UTC (rev 14750)
+++ boost/trunk/debian/changelog	2013-03-20 06:23:01 UTC (rev 14751)
@@ -3,6 +3,8 @@
   * rules: Build with hardening flags.
   * control: Depend on dpkg-dev, to get dpkg-buildflags.
 
+  * rules: context is not supported for ia64, s390, s390x, and sparc.
+  
  -- Steve M. Robbins <smr at debian.org>  Thu, 07 Mar 2013 00:58:54 -0600
 
 boost1.53 (1.53.0-1) unstable; urgency=low

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2013-03-20 05:27:03 UTC (rev 14750)
+++ boost/trunk/debian/rules	2013-03-20 06:23:01 UTC (rev 14751)
@@ -1,7 +1,8 @@
 #! /usr/bin/make -f
 
 # Boost libraries for which we want separate packages
-boost_libs := atomic chrono context date-time exception filesystem	\
+# context is special in that it is not supported yet on several architectures
+boost_libs := atomic chrono date-time exception filesystem	\
               graph graph-parallel iostreams locale math mpi		\
               mpi-python program-options python random regex		\
               serialization signals system test thread timer wave
@@ -33,7 +34,7 @@
 override_dh_auto_configure: user-config.jam make-debhelper
 
 override_dh_auto_build: $(bjam) debian/bjam.1
-	$(JAM) --without-python                        
+	$(JAM) $(JAM_WITHOUT) --without-python
 	for pyver in $(pyversions); do \
 	 	pyid=$$(echo $$pyver | tr -d .); \
 		echo "Building Boost.Python for python version $$pyver"; \
@@ -248,6 +249,7 @@
 	)
 
 TOOLSET_CONFIG = 'using gcc : : : <compileflags>"$(CPPFLAGS)" <cflags>"$(CFLAGS)" <cxxflags>"$(CXXFLAGS)" <linkflags>"$(LDFLAGS)" ;'
+BUILD_CONTEXT = yes
 BUILD_LONG_DOUBLE = yes
 
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
@@ -260,14 +262,26 @@
 BUILD_LONG_DOUBLE = no
 else ifeq ($(DEB_BUILD_ARCH), armhf)
 BUILD_LONG_DOUBLE = no
+else ifeq ($(DEB_BUILD_ARCH), ia64)
+BUILD_CONTEXT = no
 else ifeq ($(DEB_BUILD_ARCH), mips)
 BUILD_LONG_DOUBLE = no
 else ifeq ($(DEB_BUILD_ARCH), mipsel)
 BUILD_LONG_DOUBLE = no
+else ifeq ($(DEB_BUILD_ARCH), s390)
+BUILD_CONTEXT = no
+else ifeq ($(DEB_BUILD_ARCH), s390x)
+BUILD_CONTEXT = no
 else ifeq ($(DEB_BUILD_ARCH), sh4)
 BUILD_LONG_DOUBLE = no
+else ifeq ($(DEB_BUILD_ARCH), sparc)
+BUILD_CONTEXT = no
 endif
 
+ifneq ($(BUILD_CONTEXT), yes)
+JAM_WITHOUT += --without-context
+endif
+
 ifeq ($(BUILD_LONG_DOUBLE), yes)
 boost_lib_math += $(boost_lib_math_long_double)
 else