From: Damien Raude-Morvan <drazzib@debian.org>
Date: Fri, 24 Apr 2020 01:59:07 +0000 (+0100)
Subject: Pass the Debian build flags to all build components
X-Git-Tag: archive/raspbian/7u261-2.6.22-1_deb8u1+rpi1^2~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=927626c1241aeae3b38ea3ac06764d960cd0ab3f;p=openjdk-7.git

Pass the Debian build flags to all build components

Forwarded: not-needed
Last-Update: 2014-07-06


Gbp-Pq: Name it-debian-build-flags.diff
---

diff --git a/Makefile.am b/Makefile.am
index 767cd9e..b7e9f41 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -148,7 +148,7 @@ IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOUR
 IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
 
 # Flags
-IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
+IT_CFLAGS=$(CFLAGS) $(ARCHFLAG) $(EXTRA_CFLAGS_IT)
 
 # Conditional defintions
 
@@ -2576,7 +2576,8 @@ stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp
 if BUILD_JAMVM
 	cd jamvm/jamvm && \
 	./autogen.sh --with-java-runtime-library=openjdk7 \
-	  --prefix=$(abs_top_builddir)/jamvm/install ; \
+	  --prefix=$(abs_top_builddir)/jamvm/install \
+	  CFLAGS='$(EXTRA_CFLAGS_JAMVM)' LDFLAGS='$(EXTRA_LDFLAGS_JAMVM)' CPPFLAGS='$(EXTRA_CPPFLAGS_JAMVM)' CXXFLAGS='$(EXTRA_CXXFLAGS_JAMVM)'; \
 	$(MAKE) ; \
 	$(MAKE) install
 	mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server