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

[Steven Michael Robbins]

SVN commit 4532 by smr:

Fix build failures: on ppc64, set NM; on kfreebsd-amd64, --disable-fat.
Remove bashism.



 M  +8 -0      gmp/trunk/debian/changelog  
 M  +4 -3      gmp/trunk/debian/rules  


--- gmp/trunk/debian/changelog #4531:4532
@@ -1,3 +1,11 @@
+gmp (2:4.3.1+dfsg-2) unstable; urgency=low
+
+  * rules: Explicitly set NM for the powerpc 64-bit build.  Disable FAT
+    binary for kfreebsd-amd64.  Closes: #537072.  Remove bashism (touch
+    Makefile.{am,in}).  Closes: #535383.
+
+ -- Steve M. Robbins <smr at debian.org>  Thu, 23 Jul 2009 05:16:25 -0500
+
 gmp (2:4.3.1+dfsg-1) unstable; urgency=low
 
   * New upstream.
--- gmp/trunk/debian/rules #4531:4532
@@ -44,7 +44,7 @@
 
 confflags = --prefix=/usr --enable-cxx --enable-mpbsd
 
-ifneq (,$(filter $(DEB_HOST_ARCH), amd64 lpia))
+ifneq (,$(filter $(DEB_HOST_ARCH), amd64 kfreebsd-amd64 lpia))
   confflags += --disable-fat
 else
   confflags += --enable-fat
@@ -68,7 +68,7 @@
   EXTRA_INSTALL=install64
   m64=-m64
   confflags64_build = --build $(DEB_BUILD_GNU_TYPE) --host powerpc64-gnu-linux
-  confflags64 = ABI=mode64 $(confflags) $(confflags64_build) --libdir=/${lib64dir}
+  confflags64 = ABI=mode64 NM=nm $(confflags) $(confflags64_build) --libdir=/${lib64dir}
   CC64 = gcc $(m64)
   CXX64 = g++ $(m64)
   MAKE_CHECK = : disabled make check
@@ -91,7 +91,8 @@
 	mkdir gmp-doc-$(ORIG_SRC_VERSION)
 	mv gmp-$(ORIG_SRC_VERSION)+dfsg/doc/ gmp-doc-$(ORIG_SRC_VERSION)/
 	mkdir gmp-$(ORIG_SRC_VERSION)+dfsg/doc
-	touch gmp-$(ORIG_SRC_VERSION)+dfsg/doc/Makefile.{am,in}
+	touch gmp-$(ORIG_SRC_VERSION)+dfsg/doc/Makefile.am
+	touch gmp-$(ORIG_SRC_VERSION)+dfsg/doc/Makefile.in
 	cd gmp-$(ORIG_SRC_VERSION)+dfsg/ && autoreconf --force --install
 	tar czf gmp_$(ORIG_SRC_VERSION)+dfsg.orig.tar.gz gmp-$(ORIG_SRC_VERSION)+dfsg
 	tar czf gmp-doc_$(ORIG_SRC_VERSION).orig.tar.gz gmp-doc-$(ORIG_SRC_VERSION)