[php-maint] Bug#429066: please remove unneccesary DEB_BUILD_GNU_TYPE fudging

Riku Voipio riku.voipio at iki.fi
Fri Jun 15 18:32:29 UTC 2007


Package: php5
Severity: wishlist
Tags: patch
User: debian-arm at lists.debian.org
Usertags: eabi

php5 packaging first seds off -gnu from DEB_BUILD_GNU_TYPE and
DEB_HOST_GNU_SYSTEM and then adds it back unconditionally. This
brakes building on archs where *_GNU_SYSTEM does not end up
with -gnu (such as armel, where it is arm-linux-gnueabi).

The whole step seems completly pointless and the reason for
these options isn't explained. Most packages just give
DEB_BUILD_GNU_TYPE to ./configure as is.

Cheers,
Riku

-- 
"rm -rf" only sounds scary if you don't have backups
-------------- next part --------------
diff -ur php5-5.2.3.old/debian/rules php5-5.2.3/debian/rules
--- php5-5.2.3.old/debian/rules	2007-06-15 21:22:29.000000000 +0300
+++ php5-5.2.3/debian/rules	2007-06-15 21:25:48.000000000 +0300
@@ -19,9 +19,6 @@
 DEB_BUILD_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_BUILD_ARCH   ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-PHP5_HOST_GNU_TYPE    = $(shell echo $(DEB_HOST_GNU_TYPE) | sed 's/-gnu$$//')
-PHP5_BUILD_GNU_TYPE   = $(shell echo $(DEB_BUILD_GNU_TYPE) | sed 's/-gnu$$//')
-
 PHP5_SOURCE_VERSION   = $(shell dpkg-parsechangelog | grep ^Version | sed "s/Version: //")
 PHP5_UPSTREAM_VERSION = $(shell echo $(PHP5_SOURCE_VERSION) | sed -e "s/-.*//" -e "s/.*://")
 PHP5_DEBIAN_REVISION  = $(shell echo $(PHP5_SOURCE_VERSION) | sed "s/.*-//")
@@ -33,11 +30,11 @@
 CFLAGS += $(shell getconf LFS_CFLAGS)
 
 # Enable IEEE-conformant floating point math on alphas (not the default)
-ifeq (alpha-linux,$(PHP5_HOST_GNU_TYPE))
+ifeq (alpha-linux-gnu,$(DEB_HOST_GNU_TYPE))
   CFLAGS += -mieee
 endif
 
-ifeq ($(PHP5_HOST_GNU_TYPE), $(findstring $(PHP5_HOST_GNU_TYPE), ia64-linux powerpc64-linux))
+ifeq ($(DEB_HOST_GNU_TYPE), $(findstring $(DEB_HOST_GNU_TYPE), ia64-linux-gnu powerpc64-linux-gnu))
   CFLAGS += -g
 else
   CFLAGS += -gstabs
@@ -67,8 +64,8 @@
 		--with-pdo-firebird=shared,/usr
 endif
 
-COMMON_CONFIG=--build=$(PHP5_BUILD_GNU_TYPE)-gnu \
-		--host=$(PHP5_HOST_GNU_TYPE)-gnu \
+COMMON_CONFIG=--build=$(DEB_BUILD_GNU_TYPE) \
+		--host=$(DEB_HOST_GNU_TYPE) \
 		--mandir=/usr/share/man \
 		--enable-memory-limit \
 		--disable-debug \


More information about the pkg-php-maint mailing list