aboutsummaryrefslogtreecommitdiffstats
path: root/community/openjdk8/build-demo-ldflags.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-05-10 11:17:29 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-05-10 13:20:10 +0200
commit150c9b2836ce6fba7a512e569b3c2a151338b9dc (patch)
treea48321e847490428ae6fc530d96deb748e6609e9 /community/openjdk8/build-demo-ldflags.patch
parente9c02563843de1f486cae7cc96da90eb9113169b (diff)
downloadaports-150c9b2836ce6fba7a512e569b3c2a151338b9dc.tar.gz
aports-150c9b2836ce6fba7a512e569b3c2a151338b9dc.tar.bz2
aports-150c9b2836ce6fba7a512e569b3c2a151338b9dc.tar.xz
community/openjdk8: security upgrade to 8u92
Diffstat (limited to 'community/openjdk8/build-demo-ldflags.patch')
-rw-r--r--community/openjdk8/build-demo-ldflags.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/community/openjdk8/build-demo-ldflags.patch b/community/openjdk8/build-demo-ldflags.patch
index ded0f11c8b..b30cc455ac 100644
--- a/community/openjdk8/build-demo-ldflags.patch
+++ b/community/openjdk8/build-demo-ldflags.patch
@@ -2,20 +2,20 @@ 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 @@
+@@ -244,6 +244,7 @@
+ # eval call below, the comma gets expanded too early.
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), \
+@@ -251,7 +252,7 @@
LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \
OPTIMIZATION := LOW, \
CXXFLAGS := $$($1_CXXFLAGS), \
-- LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \
+- LDFLAGS := $(filter-out -incremental:no -opt:ref, $$(LDFLAGS_JDKLIB)), \
+ LDFLAGS := $$(BUILD_DEMO_JVMTI_$1_LDFLAGS), \
- LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \
+ LDFLAGS_macosx := $$(call SET_EXECUTABLE_ORIGIN), \
LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \
LDFLAGS_SUFFIX_posix := $5, \