diff options
| -rw-r--r-- | lang/openjdk8/distinfo | 4 | ||||
| -rw-r--r-- | lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_jsig.make | 20 |
2 files changed, 13 insertions, 11 deletions
diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo index 3f1719bfa19..91510d3e4c1 100644 --- a/lang/openjdk8/distinfo +++ b/lang/openjdk8/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.74 2019/11/02 21:31:14 tnn Exp $ +$NetBSD: distinfo,v 1.75 2019/11/05 22:30:15 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 @@ -58,7 +58,7 @@ SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 7195c97c4f559b2e9410028 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) = cf3a42b377f5e470bcd665137420075900e2863e +SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = b2db4dbfd7cf3e862bf4604d722f5cf4e898c1bc 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 --git a/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_jsig.make b/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_jsig.make index 474190d6692..113d8afb67d 100644 --- a/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_jsig.make +++ b/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_jsig.make @@ -1,10 +1,10 @@ -$NetBSD: patch-hotspot_make_solaris_makefiles_jsig.make,v 1.3 2019/11/02 21:31:14 tnn Exp $ +$NetBSD: patch-hotspot_make_solaris_makefiles_jsig.make,v 1.4 2019/11/05 22:30:15 jperkin Exp $ GCC support. --- hotspot/make/solaris/makefiles/jsig.make.orig 2019-10-16 01:41:55.000000000 +0000 +++ hotspot/make/solaris/makefiles/jsig.make -@@ -39,10 +39,11 @@ DEST_JSIG_DIZ = $(JDK_LIBDIR)/$(LI +@@ -39,17 +39,27 @@ DEST_JSIG_DIZ = $(JDK_LIBDIR)/$(LI LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig @@ -17,17 +17,19 @@ GCC support. else LFLAGS_JSIG += -mt -xnolib endif -@@ -52,6 +53,13 @@ ifneq ($(DEBUG_LEVEL), slowdebug) - JSIG_OPT_FLAGS = -xO4 -g - endif + # Optimize jsig lib unless it's a slowdebug build + ifneq ($(DEBUG_LEVEL), slowdebug) ++ ifndef USE_GCC + JSIG_OPT_FLAGS = -xO4 -g ++ endif ++endif ++ +# DEBUG_BINARIES overrides everything, use full -g debug information +ifdef USE_GCC + ifeq ($(DEBUG_BINARIES), true) + JSIG_OPT_FLAGS = -g + endif -+endif -+ + endif + $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE) - @echo Making signal interposition lib... - $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \ |