Date: Fri, 23 Feb 2018 18:14:59 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462712 - branches/2018Q1/java/openjdk7/files Message-ID: <201802231814.w1NIExuv079840@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Fri Feb 23 18:14:59 2018 New Revision: 462712 URL: https://svnweb.freebsd.org/changeset/ports/462712 Log: MFH: r459311 Fix build with Clang 6.0. Note it is partially merged from the upstream patches for Linux and GCC 6. https://bugs.openjdk.java.net/browse/JDK-8163032 http://hg.openjdk.java.net/jdk7u/jdk7u/hotspot/rev/e34324d73cd5 http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/9e1264f51bae PR: 225054 Approved by: ports-secteam (implicit) Added: branches/2018Q1/java/openjdk7/files/patch-hotspot_make_bsd_makefiles_gcc.make - copied unchanged from r459311, head/java/openjdk7/files/patch-hotspot_make_bsd_makefiles_gcc.make branches/2018Q1/java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk - copied unchanged from r459311, head/java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk Modified: Directory Properties: branches/2018Q1/ (props changed) Copied: branches/2018Q1/java/openjdk7/files/patch-hotspot_make_bsd_makefiles_gcc.make (from r459311, head/java/openjdk7/files/patch-hotspot_make_bsd_makefiles_gcc.make) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/java/openjdk7/files/patch-hotspot_make_bsd_makefiles_gcc.make Fri Feb 23 18:14:59 2018 (r462712, copy of r459311, head/java/openjdk7/files/patch-hotspot_make_bsd_makefiles_gcc.make) @@ -0,0 +1,10 @@ +--- hotspot/make/bsd/makefiles/gcc.make.orig ++++ hotspot/make/bsd/makefiles/gcc.make +@@ -112,6 +112,7 @@ ifeq ($(JVM_VARIANT_ZEROSHARK), true) + CFLAGS += $(LIBFFI_CFLAGS) + CFLAGS += $(LLVM_CFLAGS) + endif ++CFLAGS += -std=gnu++98 + CFLAGS += $(VM_PICFLAG) + CFLAGS += -fno-rtti + CFLAGS += -fno-exceptions Copied: branches/2018Q1/java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk (from r459311, head/java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk Fri Feb 23 18:14:59 2018 (r462712, copy of r459311, head/java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk) @@ -0,0 +1,11 @@ +--- jdk/make/common/Defs-bsd.gmk.orig ++++ jdk/make/common/Defs-bsd.gmk +@@ -274,7 +274,7 @@ CFLAGS_OPT = $(CC_OPT) + CFLAGS_DBG = $(DEBUG_FLAG) + CFLAGS_COMMON += $(CFLAGS_REQUIRED) + +-CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS) ++CXXFLAGS_COMMON = -std=gnu++98 $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS) + CXXFLAGS_OPT = $(CC_OPT) + CXXFLAGS_DBG = $(DEBUG_FLAG) + CXXFLAGS_COMMON += $(CFLAGS_REQUIRED)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802231814.w1NIExuv079840>