aboutsummaryrefslogtreecommitdiffstats
path: root/testing/openjdk8/build-demo-ldflags.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-08-18 11:15:16 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2015-08-18 11:16:36 +0200
commitef4f1e78f322e3f0b2a5b4816d43bc4196ac3bd5 (patch)
tree1ad97bab187691bd12cbfe12202cd2b7f92e0271 /testing/openjdk8/build-demo-ldflags.patch
parent166ad0377b8e939f7777c85b4a791ae53969a42b (diff)
downloadaports-ef4f1e78f322e3f0b2a5b4816d43bc4196ac3bd5.tar.gz
aports-ef4f1e78f322e3f0b2a5b4816d43bc4196ac3bd5.tar.bz2
aports-ef4f1e78f322e3f0b2a5b4816d43bc4196ac3bd5.tar.xz
main/openjdk8: respect our CFLAGS and LDFLAGS and build on x86 too
Diffstat (limited to 'testing/openjdk8/build-demo-ldflags.patch')
-rw-r--r--testing/openjdk8/build-demo-ldflags.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/testing/openjdk8/build-demo-ldflags.patch b/testing/openjdk8/build-demo-ldflags.patch
new file mode 100644
index 0000000000..ded0f11c8b
--- /dev/null
+++ b/testing/openjdk8/build-demo-ldflags.patch
@@ -0,0 +1,21 @@
+our LDFLAGS has -Wl,-z,relro but the commas are expanded too early in makefile.
+
+--- ./jdk/make/CompileDemos.gmk.orig
++++ ./jdk/make/CompileDemos.gmk
+@@ -245,13 +245,15 @@
+ BUILD_DEMO_JVMTI_$1_CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_DEBUG_SYMBOLS) \
+ -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3
+
++ BUILD_DEMO_JVMTI_$1_LDFLAGS := $(filter-out -incremental:no -opt:ref,$(LDFLAGS_JDKLIB))
++
+ # Remove the -incremental:no setting to get .ilk-files like in the old build.
+ $$(eval $$(call SetupNativeCompilation,BUILD_DEMO_JVMTI_$1, \
+ SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \
+ LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \
+ OPTIMIZATION := LOW, \
+ CXXFLAGS := $$($1_CXXFLAGS), \
+- LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \
++ LDFLAGS := $$(BUILD_DEMO_JVMTI_$1_LDFLAGS), \
+ LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \
+ LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \
+ LDFLAGS_SUFFIX_posix := $5, \