diff -purN maverick/gmp-4.3.2+dfsg/debian/rules ppa/gmp-4.3.2+dfsg-1ubuntu1//debian/rules --- maverick/gmp-4.3.2+dfsg/debian/rules 2010-11-23 14:28:06.000000000 +0000 +++ ppa/gmp-4.3.2+dfsg-1ubuntu1//debian/rules 2010-11-25 09:44:03.000000000 +0000 @@ -15,19 +15,19 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_ JOBSFLAG = -j$(NUMJOBS) endif -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)) +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)) -MAKE_CHECK = : disabled make check +MAKE_CHECK =: disabled make check ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) - ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) MAKE_CHECK = $(MAKE) check endif endif export CFLAGS = -Wall -g -D_REENTRANT -export LDFLAGS = -Wl,-Bsymbolic-functions +export LDFLAGS= -Wl,-Bsymbolic-functions ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 @@ -41,13 +41,13 @@ lib64dir = usr/lib64 confflags = --prefix=/usr --enable-cxx --enable-mpbsd -ifneq (,$(filter $(DEB_HOST_ARCH), amd64 kfreebsd-amd64 lpia)) +ifneq (,$(filter$(DEB_HOST_ARCH),amd64 kfreebsd-amd64 lpia)) confflags += --disable-fat else confflags += --enable-fat endif -ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) AR = ar confflags_build += --build $(DEB_BUILD_GNU_TYPE) else @@ -55,31 +55,31 @@ else confflags_build += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) endif -ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 ppc64 kfreebsd-amd64)) - EXTRA_INSTALL=install32 - m32=-m32 +ifneq (,$(findstring $(DEB_HOST_ARCH),amd64 ppc64 kfreebsd-amd64)) + EXTRA_INSTALL = install32 + m32 = -m32 confflags32 = ABI=32 $(confflags) $(confflags_build) --libdir=/${lib32dir} endif -ifneq (,$(findstring $(DEB_HOST_ARCH), armel)) - CFLAGS += -Wa,--defsym,USES_THUMB=1 +ifneq (,$(findstring $(DEB_HOST_ARCH),armel)) + CFLAGS += -Wa,--defsym,USES_THUMB=1 endif -ifneq (,$(findstring $(DEB_HOST_ARCH), powerpc)) - EXTRA_INSTALL=install64 - m64=-m64 +ifneq (,$(findstring $(DEB_HOST_ARCH),powerpc)) + EXTRA_INSTALL = install64 + m64 = -m64 confflags64_build = --build $(DEB_BUILD_GNU_TYPE) --host powerpc64-gnu-linux confflags64 = ABI=mode64 NM=nm $(confflags) $(confflags64_build) --libdir=/${lib64dir} CC64 = gcc $(m64) CXX64 = g++ $(m64) - MAKE_CHECK = : disabled make check + MAKE_CHECK =: disabled make check endif -CC = $(DEB_HOST_GNU_TYPE)-gcc +CC = $(DEB_HOST_GNU_TYPE)-gcc CC32 = $(DEB_HOST_GNU_TYPE)-gcc $(m32) CC64 = $(DEB_HOST_GNU_TYPE)-gcc $(m64) -CXX = $(DEB_HOST_GNU_TYPE)-g++ +CXX = $(DEB_HOST_GNU_TYPE)-g++ CXX32 = $(DEB_HOST_GNU_TYPE)-g++ $(m32) CXX64 = $(DEB_HOST_GNU_TYPE)-g++ $(m64) @@ -105,7 +105,7 @@ configure: patch configure-stamp configure-stamp: mkdir -p build cd build && ../configure $(confflags) \ - AR=$(AR) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + AR="$(AR)" CC="$(CC)" CFLAGS="$(CFLAGS)" \ CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" CC="$(DEB_HOST_GNU_TYPE)-gcc" sh debian/fix-gmp-h.sh build touch $@ @@ -114,7 +114,7 @@ configure32: patch configure32-stamp configure32-stamp: mkdir -p build32 cd build32 && ../configure $(confflags32) \ - AR=$(AR) CC="$(CC32)" CFLAGS="$(CFLAGS)" \ + AR="$(AR)" CC="$(CC32)" CFLAGS="$(CFLAGS)" \ CXX="$(CXX32)" CXXFLAGS="$(CXXFLAGS)" CC="$(CC32)" sh debian/fix-gmp-h.sh build32 touch $@ @@ -123,7 +123,7 @@ configure64: patch configure64-stamp configure64-stamp: mkdir -p build64 cd build64 && ../configure $(confflags64) \ - AR=$(AR) CC="$(CC64)" CFLAGS="$(CFLAGS)" \ + AR="$(AR)" CC="$(CC64)" CFLAGS="$(CFLAGS)" \ CXX="$(CXX64)" CXXFLAGS="$(CXXFLAGS)" CC="$(CC64)" sh debian/fix-gmp-h.sh build64 touch $@