Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 Jan 2018 01:58:19 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r459311 - head/java/openjdk7/files
Message-ID:  <201801180158.w0I1wJkO004854@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Thu Jan 18 01:58:19 2018
New Revision: 459311
URL: https://svnweb.freebsd.org/changeset/ports/459311

Log:
  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

Added:
  head/java/openjdk7/files/patch-hotspot_make_bsd_makefiles_gcc.make   (contents, props changed)
  head/java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk   (contents, props changed)

Added: head/java/openjdk7/files/patch-hotspot_make_bsd_makefiles_gcc.make
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/openjdk7/files/patch-hotspot_make_bsd_makefiles_gcc.make	Thu Jan 18 01:58:19 2018	(r459311)
@@ -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

Added: head/java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk	Thu Jan 18 01:58:19 2018	(r459311)
@@ -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?201801180158.w0I1wJkO004854>