[php-maint] Bug#738984: dpkg-buildflags overrides CFLAGS amendments

[Robie Basak]

Source: php5
Version: 5.5.9+dfsg-1
Severity: important
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Downstream bug: https://launchpad.net/bugs/1280044

Currently, debian/rules makes some additions to CFLAGS, including the
use of `getconf LFS_CFLAGS` for large file support on i386.

However, it then includes /usr/share/dpkg/buildflags.mk, which wipes out
these changes. This causes all previous CFLAGS changes to be wiped out,
including large file support. I can see the consequence of this in the
build log when I build i386, where CFLAGS is missing
"-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64".

If I understand your intent correctly, simply moving the buildflags.mk
include to the top fixes this. Proposed patch:

diff -Nru php5-5.5.9+dfsg/debian/rules php5-5.5.9+dfsg/debian/rules
--- php5-5.5.9+dfsg/debian/rules        2014-01-11 22:49:54.000000000 +0000
+++ php5-5.5.9+dfsg/debian/rules        2014-02-14 14:26:44.000000000 +0000
@@ -16,6 +16,10 @@
 # compatibility to upstream
 PHP5_COMPAT=no
 
+# enable dpkg build flags
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 DEB_HOST_GNU_TYPE    ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_ARCH        ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -109,10 +113,6 @@
     MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-# enable dpkg build flags
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-
 COMMON_CONFIG=--build=$(DEB_BUILD_GNU_TYPE) \
                --host=$(DEB_HOST_GNU_TYPE) \
                --sysconfdir=/etc \

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-php-maint/attachments/20140214/a03a521d/attachment.sig>