[Pkg-scicomp-commits] gmp/trunk/debian

[Steven Michael Robbins]

SVN commit 4258 by smr:

Add --build and --host options to configure.  Fix make -j and make check.

 M  +8 -0      gmp/trunk/debian/changelog  
 M  +20 -12    gmp/trunk/debian/rules  


--- gmp/trunk/debian/changelog #4257:4258
@@ -1,3 +1,11 @@
+gmp (2:4.2.4+dfsg-4) experimental; urgency=low
+
+  * rules: Add --build and --host options to configure.  Supply jobs
+    option (-jN) only to initial make rather than setting MAKEFLAGS.  Run
+    test suite if build machine is same as target machine.
+
+ -- Steve M. Robbins <smr at debian.org>  Sun, 15 Mar 2009 03:43:27 -0500
+
 gmp (2:4.2.4+dfsg-3) experimental; urgency=low
 
   * rules: Revert to debhelper in preparation for building 32- and 64-bit
--- gmp/trunk/debian/rules #4257:4258
@@ -11,22 +11,27 @@
 
 ORIG_SRC_VERSION = 4.2.4
 
-DEB_CONFIGURE_FLAGS = --prefix=/usr
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-cxx --enable-mpbsd
+confflags = --prefix=/usr --enable-cxx --enable-mpbsd
 
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-  NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-  MAKEFLAGS += -j$(NUMJOBS)
+DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+export DEB_HOST_GNU_TYPE  := $(subst i386,i486, $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE))
+export DEB_BUILD_GNU_TYPE := $(subst i386,i486, $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE))
+
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-ifeq (amd64,$(DEB_HOST_ARCH_CPU))
-  DEB_CONFIGURE_EXTRA_FLAGS += --disable-fat
+ifneq (,$(filter $(DEB_HOST_ARCH), amd64 lpia))
+  confflags += --disable-fat
 else
-  DEB_CONFIGURE_EXTRA_FLAGS += --enable-fat
+  confflags += --enable-fat
 endif
 
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  DEB_MAKE_CHECK_TARGET = check
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  JOBSFLAG = -j$(NUMJOBS)
 endif
 
 
@@ -47,13 +52,16 @@
 
 configure: patch configure-stamp
 configure-stamp:
-	./configure $(DEB_CONFIGURE_FLAGS) $(DEB_CONFIGURE_EXTRA_FLAGS)
+	./configure $(confflags)
 	touch configure-stamp
 
 build: configure build-stamp
 build-stamp:
 	dh_testdir
-	$(MAKE)
+	$(MAKE) $(JOBSFLAG)
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+	$(MAKE) $(JOBSFLAG) check
+endif
 	touch build-stamp
 
 clean: clean-patched unpatch