[Pkg-xen-changes] [xen] 01/08: Correct handling of additions to CFLAGS, CPPFLAGS and LDFLAGS.

[Bastian Blank]

This is an automated email from the git hooks/post-receive script.

waldi pushed a commit to branch develop
in repository xen.

commit 092785a0d86ae4b3c5a22f144162fdd596de0b97
Author: Ian Campbell <ijc at hellion.org.uk>
Date:   Mon Aug 4 12:15:36 2014 +0100

    Correct handling of additions to CFLAGS, CPPFLAGS and LDFLAGS.
    
    APPEND_* need to be passed to make not configure. For CFLAGS we should use
    EXTRA_CFLAGS_XEN_TOOLS rather than APPEND_CFLAGS since the latter applies to
    everything including e.g. hvmloader where -fstack-protector causes build
    failures (stack protector isn't any use in this context).
---
 debian/changelog  | 2 +-
 debian/rules.real | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 87a6536..4706cfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,7 +23,7 @@ xen (4.4.0-1) UNRELEASED; urgency=medium
     instead of by patching. No need to build-depend on ipxe any more.
   * Use system qemu-xen via new configure option instead of patching.
   * Use system seabios via new configure option instead of patching.
-  * Use APPEND_{CFLAGS,CPPFLAGS,LDFLAGS} during build.
+  * Use EXTRA_CFLAGS_XEN_TOOLS and APPEND_{CPPFLAGS,LDFLAGS} during build.
 
  -- Bastian Blank <waldi at debian.org>  Sat, 05 Jul 2014 12:54:54 +0200
 
diff --git a/debian/rules.real b/debian/rules.real
index 0e32458..fa44253 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -59,8 +59,6 @@ $(STAMPS_DIR)/setup-utils_$(ARCH):
 	mkdir -p $(DIR)
 	cp -al $(SOURCE_FILES) $(DIR)
 	cd $(DIR)/tools; \
-		APPEND_CFLAGS="$(CFLAGS)" APPEND_CPPFLAGS="$(CPPFLAGS)" \
-		APPEND_LDFLAGS="$(LDFLAGS)" \
 		WGET=/bin/false \
 		./configure \
 			--prefix=/usr \
@@ -93,6 +91,9 @@ $(STAMPS_DIR)/install-utils_$(ARCH): CONFIG = \
 		XEN_COMPILE_ARCH=$(XEN_ARCH) \
 		XEN_TARGET_ARCH=$(XEN_ARCH) \
 		XEN_VERSION=$(VERSION) \
+		EXTRA_CFLAGS_XEN_TOOLS="$(CFLAGS)" \
+		APPEND_CPPFLAGS="$(CPPFLAGS)" \
+		APPEND_LDFLAGS="$(LDFLAGS)" \
 		OCAMLDESTDIR=$(CURDIR)/$(BUILD_DIR)/install-utils_$(ARCH)/$(OCAML_STDLIB_DIR) \
 		PYTHON=$(shell pyversions -r)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git