[pkgsrc/trunk]: pkgsrc/lang/openjdk8 openjdk8: Support user CFLAGS.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/51e203c470d0
branches:  trunk
changeset: 372756:51e203c470d0
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Dec 15 14:27:52 2017 +0000

description:
openjdk8: Support user CFLAGS.

diffstat:

 lang/openjdk8/Makefile                                                 |   5 +-
 lang/openjdk8/distinfo                                                 |   6 +-
 lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_dtrace.make |  40 +++++++++-
 lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_jsig.make   |  10 +-
 4 files changed, 52 insertions(+), 9 deletions(-)

diffs (119 lines):

diff -r 5ab962a245dc -r 51e203c470d0 lang/openjdk8/Makefile
--- a/lang/openjdk8/Makefile    Fri Dec 15 14:03:16 2017 +0000
+++ b/lang/openjdk8/Makefile    Fri Dec 15 14:27:52 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2017/11/28 05:07:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.56 2017/12/15 14:27:52 jperkin Exp $
 
 DISTNAME=      openjdk-1.8.152-20171128
 PKGNAME=       openjdk8-1.8.152
@@ -98,6 +98,9 @@
 CFLAGS+=       -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
 CXXFLAGS+=     -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
 
+CONFIGURE_ENV+=        CFLAGS_JDK=${CFLAGS:Q}
+CONFIGURE_ENV+=        CXXFLAGS_JDK=${CXXFLAGS:Q}
+
 .if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc)
 MAKE_ENV+=     USE_GCC=1
 MAKE_ENV+=     ARCH_DATA_MODEL=${ABI:Q}
diff -r 5ab962a245dc -r 51e203c470d0 lang/openjdk8/distinfo
--- a/lang/openjdk8/distinfo    Fri Dec 15 14:03:16 2017 +0000
+++ b/lang/openjdk8/distinfo    Fri Dec 15 14:27:52 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.51 2017/11/28 05:07:25 ryoon Exp $
+$NetBSD: distinfo,v 1.52 2017/12/15 14:27:52 jperkin Exp $
 
 SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
 RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
@@ -69,10 +69,10 @@
 SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14
 SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239
 SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 7195c97c4f559b2e9410028315de351c5047d59d
-SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = 0c9dc2b97d49cf557dc57071fd7c312b9cb8e598
+SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = 84e3d6b6603887aaac13747b5c972dd3eec4c7f1
 SHA1 (patch-hotspot_make_solaris_makefiles_fastdebug.make) = 632f96a322f1568df6f49bf31716bafe1d324976
 SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = 4763215f5ce2c3d9fcadb69e52afad7c9de97417
-SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = 10ecc1bd24d6d555e4730041c9dce1d3258bcab0
+SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = 06d9e495fe7f28b11b169cf4e56d7f8a37944ed7
 SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc) = 58965fe7c142b67be35cab8b30f84dcee2096e39
 SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc) = 2dfd843c450971ee0857cbd81b946a4d7c86ee3b
 SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc) = 82ac550f4c342f657834f30f87b7b359e2b7b41b
diff -r 5ab962a245dc -r 51e203c470d0 lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_dtrace.make
--- a/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_dtrace.make    Fri Dec 15 14:03:16 2017 +0000
+++ b/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_dtrace.make    Fri Dec 15 14:27:52 2017 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-hotspot_make_solaris_makefiles_dtrace.make,v 1.1 2015/07/03 20:40:59 fhajny Exp $
+$NetBSD: patch-hotspot_make_solaris_makefiles_dtrace.make,v 1.2 2017/12/15 14:27:52 jperkin Exp $
 
 Enable DTrace support with GCC.
 
---- hotspot/make/solaris/makefiles/dtrace.make.orig    2015-06-10 10:31:44.000000000 +0000
+--- hotspot/make/solaris/makefiles/dtrace.make.orig    2017-11-28 00:13:38.000000000 +0000
 +++ hotspot/make/solaris/makefiles/dtrace.make
 @@ -29,13 +29,6 @@
  
@@ -45,6 +45,42 @@
  # making libjvm_db
  
  # Use mapfile with libjvm_db.so
+@@ -99,7 +101,7 @@ XLIBJVM_DTRACE_DIZ         = $(XLIBJVM_D
+ $(XLIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE)
+       @echo Making $@
+       $(QUIETLY) mkdir -p $(XLIBJVM_DIR) ; \
+-      $(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. -I$(GENERATED) \
++      $(CC) $(CFLAGS) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. -I$(GENERATED) \
+               $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+       $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DB_DEBUGINFO)
+@@ -125,7 +127,7 @@ endif
+ $(XLIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
+       @echo Making $@
+       $(QUIETLY) mkdir -p $(XLIBJVM_DIR) ; \
+-      $(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. \
++      $(CC) $(CFLAGS) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. \
+               $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+       $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DTRACE_DEBUGINFO)
+@@ -190,7 +192,7 @@ $(JVMOFFS.o): $(JVMOFFS).h $(JVMOFFS).cp
+ 
+ $(LIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_DB_MAPFILE)
+       @echo Making $@
+-      $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. -I$(GENERATED) \
++      $(QUIETLY) $(CC) $(CFLAGS) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. -I$(GENERATED) \
+               $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+       $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DB_DEBUGINFO)
+@@ -211,7 +213,7 @@ endif
+ 
+ $(LIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(XLIBJVM_DTRACE) $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
+       @echo Making $@
+-      $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I.  \
++      $(QUIETLY) $(CC) $(CFLAGS) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I.  \
+               $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+       $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DTRACE_DEBUGINFO)
 @@ -352,8 +354,6 @@ dtraceCheck:
  
  endif # ifneq ("${dtraceFound}", "")
diff -r 5ab962a245dc -r 51e203c470d0 lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_jsig.make
--- a/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_jsig.make      Fri Dec 15 14:03:16 2017 +0000
+++ b/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_jsig.make      Fri Dec 15 14:27:52 2017 +0000
@@ -1,10 +1,14 @@
-$NetBSD: patch-hotspot_make_solaris_makefiles_jsig.make,v 1.1 2015/07/03 20:40:59 fhajny Exp $
+$NetBSD: patch-hotspot_make_solaris_makefiles_jsig.make,v 1.2 2017/12/15 14:27:52 jperkin Exp $
 
 GCC support.
 
---- hotspot/make/solaris/makefiles/jsig.make.orig      2015-06-10 10:31:44.000000000 +0000
+--- hotspot/make/solaris/makefiles/jsig.make.orig      2017-11-28 00:13:38.000000000 +0000
 +++ hotspot/make/solaris/makefiles/jsig.make
-@@ -42,15 +42,25 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfi
+@@ -39,18 +39,29 @@ DEST_JSIG_DIZ       = $(JDK_LIBDIR)/$(LI
+ 
+ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
+ 
++LFLAGS_JSIG += $(CFLAGS)
  LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
  
  ifdef USE_GCC