[pkg-boost-commits] r13910 - boost/branches/debian-1.33.0/debian

[Domenico Andreoli]

Author: cavok
Date: 2005-12-20 16:22:41 +0000 (Tue, 20 Dec 2005)
New Revision: 13910

Modified:
   boost/branches/debian-1.33.0/debian/rules
Log:
m68k and hppa now build with gcc 4.0. workaround for #341174 on hppa: build with -mlong-calls.

Modified: boost/branches/debian-1.33.0/debian/rules
===================================================================
--- boost/branches/debian-1.33.0/debian/rules	2005-12-16 17:12:43 UTC (rev 13909)
+++ boost/branches/debian-1.33.0/debian/rules	2005-12-20 16:22:41 UTC (rev 13910)
@@ -29,14 +29,19 @@
 
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-GCC=gcc-3.4
-GXX=g++-3.4
-ifneq ($(DEB_BUILD_ARCH), hppa)
-ifneq ($(DEB_BUILD_ARCH), m68k)
+#GCC=gcc-3.4
+#GXX=g++-3.4
+#ifneq ($(DEB_BUILD_ARCH), hppa)
+#ifneq ($(DEB_BUILD_ARCH), m68k)
 GCC=gcc
 GXX=g++
+#endif
+#endif
+
+LONGCALLS=<cflags>-mlong-calls
+ifneq ($(DEB_BUILD_ARCH), hppa)
+LONGCALLS=
 endif
-endif
 
 exampledir = debian/libboost-doc/usr/share/doc/libboost-doc/examples
 htmldir = debian/libboost-doc/usr/share/doc/libboost-doc/HTML
@@ -64,7 +69,7 @@
 
 	# Build most of the stuff with jam
 	cd tools/bcp && ../../$(JAM) -sBUILD="release <define>_REENTRANT <threading>single" bcp
-	$(JAM) -sBUILD="debug release <define>_REENTRANT <threading>single/multi"
+	$(JAM) -sBUILD="debug release <define>_REENTRANT <threading>single/multi $(LONGCALLS)"
 	#cd libs/graph/build && ../../../$(JAM) -sBUILD="debug release" bgl-viz.a bgl-viz.so
 	#cd libs/graph/build/python && ../../../../$(JAM)