diff options
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/debian/rules b/debian/rules index 3d679f113..37e930ff7 100755 --- a/debian/rules +++ b/debian/rules @@ -20,9 +20,6 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) 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 @@ ifneq (yes,$(PHP5_COMPAT)) 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 @@ ifneq (,$(filter $(DEB_BUILD_ARCH),amd64 i386 powerpc sparc)) --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 \ @@ -130,10 +127,14 @@ unprepared: rm -f build/libtool.m4 main/php_config.h.in rm -f prepared-stamp -test-results.txt: +test-results.txt: build-apache2-stamp build-cli-stamp build-cgi-stamp +ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) mkdir -p temp_session_store env NO_INTERACTION=1 TEST_PHP_CGI_EXECUTABLE=./cgi-build/sapi/cgi/cgi-bin.php5 TEST_PHP_EXECUTABLE=./apache2-build/sapi/cli/php ./apache2-build/sapi/cli/php run-tests.php > test-results.txt rm -rf temp_session_store +else + echo 'nocheck found in DEB_BUILD_OPTIONS' > test-results.txt +endif cat test-results.txt build: build-apache2-stamp build-cgi-stamp build-cli-stamp build-pear-stamp test-results.txt |