[Pkg-php-commits] r986 - php5/trunk/debian

[Sean Finney]

tags 429066 pending
thanks

Author: seanius
Date: 2008-01-27 22:54:09 +0000 (Sun, 27 Jan 2008)
New Revision: 986

Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/rules
Log:
fudge fix

Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2008-01-27 22:50:27 UTC (rev 985)
+++ php5/trunk/debian/changelog	2008-01-27 22:54:09 UTC (rev 986)
@@ -5,6 +5,8 @@
   * Updated suhosin patch for 5.2.5 minus ./configure as before.
   * Workaround for xargs not handling extra long cmdlines in session
     cleanup script (Closes: #461755).
+  * Remove unneccesary DEB_BUILD_GNU_TYPE fudging (Closes: #429066).  Thanks
+    to Riku Voipio for the report/patch.
   * Not yet released.
 
   [ Raphael Geissert ]

Modified: php5/trunk/debian/rules
===================================================================
--- php5/trunk/debian/rules	2008-01-27 22:50:27 UTC (rev 985)
+++ php5/trunk/debian/rules	2008-01-27 22:54:09 UTC (rev 986)
@@ -20,9 +20,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/.*-//")
@@ -36,11 +33,11 @@
 endif
 
 # 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
@@ -65,8 +62,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 \