diff options
author | Daniel McGregor <daniel.mcgregor@vecima.com> | 2016-06-22 10:38:45 -0600 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-06-30 12:07:44 -0300 |
commit | 33ddb28a6428b02ddcc82d1954ecf27cd426fbb5 (patch) | |
tree | eb39d51b3b35a2a3096bfd79ca95e2179dd0be8c /recipes-core/openjdk/patches-openjdk-8 | |
parent | 6483010d92be7f6e1e0a268d1ca4b5fc4353c70e (diff) | |
download | meta-java-33ddb28a6428b02ddcc82d1954ecf27cd426fbb5.tar.gz |
openjdk-8: make GCC6 happy
GCC 6 sets the default C++ standard to C++14 and introduces dead store
elimination by default. OpenJDK 8 is not ready for either of these
changes, so set the C++ standard back to gnu++98 and disable dead
store elimination.
Switched to using --with-extra-cflags, cxxflags, and ldflags. The added
patch fixes building when using those flags, and are needed to get
CFLAGS into the JDK build in the native case.
Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/openjdk8-avoid-early-ldflags-expansion.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-avoid-early-ldflags-expansion.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-avoid-early-ldflags-expansion.patch new file mode 100644 index 0000000..528560c --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/openjdk8-avoid-early-ldflags-expansion.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | # HG changeset patch | ||
2 | # User andrew | ||
3 | # Date 1452261185 0 | ||
4 | # Fri Jan 08 13:53:05 2016 +0000 | ||
5 | # Node ID 92c6a16b6daccda4b7c7f9612e4057df006b9f22 | ||
6 | # Parent b95e325137b439b33a7bb013be21475df5da3a03 | ||
7 | 8146566: OpenJDK build can't handle commas in LDFLAGS | ||
8 | Summary: Backport part of 8142907 to avoid early LDFLAGS expansion | ||
9 | Reviewed-by: erikj | ||
10 | |||
11 | diff --git jdk/make/CompileDemos.gmk jdk/make/CompileDemos.gmk | ||
12 | --- jdk/make/CompileDemos.gmk | ||
13 | +++ jdk/make/CompileDemos.gmk | ||
14 | @@ -224,17 +224,17 @@ define SetupJVMTIDemo | ||
15 | $$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/, $2)/README.txt) \ | ||
16 | $$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/, $2)/sample.makefile.txt) | ||
17 | BUILD_DEMO_JVMTI_$1_EXTRA_INC := $$(addprefix -I, $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC)) | ||
18 | BUILD_DEMO_JVMTI_$1_LANG := C | ||
19 | ifneq (, $4) | ||
20 | BUILD_DEMO_JVMTI_$1_LANG := $4 | ||
21 | endif | ||
22 | ifeq (C++, $4) | ||
23 | - $1_EXTRA_CXX := $(LDFLAGS_CXX_JDK) $(LIBCXX) | ||
24 | + $1_EXTRA_CXX := $$(LDFLAGS_CXX_JDK) $(LIBCXX) | ||
25 | endif | ||
26 | |||
27 | $1_CXXFLAGS := $(CXXFLAGS_JDKLIB) -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 \ | ||
28 | $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3 \ | ||
29 | $(CXXFLAGS_DEBUG_SYMBOLS) | ||
30 | ifeq ($1-$(OPENJDK_TARGET_CPU_ARCH), waiters-sparc) | ||
31 | $1_FILTER := -xregs=no%appl | ||
32 | $1_CXXFLAGS := $$(filter-out $$($1_FILTER), $$($1_CXXFLAGS)) | ||
33 | @@ -246,18 +246,18 @@ define SetupJVMTIDemo | ||
34 | -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3 | ||
35 | |||
36 | # Remove the -incremental:no setting to get .ilk-files like in the old build. | ||
37 | $$(eval $$(call SetupNativeCompilation,BUILD_DEMO_JVMTI_$1, \ | ||
38 | SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \ | ||
39 | LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \ | ||
40 | OPTIMIZATION := LOW, \ | ||
41 | CXXFLAGS := $$($1_CXXFLAGS), \ | ||
42 | - LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \ | ||
43 | - LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \ | ||
44 | + LDFLAGS := $(filter-out -incremental:no -opt:ref, $$(LDFLAGS_JDKLIB)), \ | ||
45 | + LDFLAGS_macosx := $$(call SET_EXECUTABLE_ORIGIN), \ | ||
46 | LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \ | ||
47 | LDFLAGS_SUFFIX_posix := $5, \ | ||
48 | LDFLAGS_SUFFIX_windows := $6, \ | ||
49 | LDFLAGS_SUFFIX_solaris := $7 -lc, \ | ||
50 | LDFLAGS_SUFFIX_linux := $8, \ | ||
51 | VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ | ||
52 | RC_FLAGS := $$(RC_FLAGS) \ | ||
53 | -D "JDK_FNAME=$1.dll" \ | ||