Merge pull request #3298 from hadfl/jdk_r38

openjdk11: update to 11.0.20+8 (r151038)
omniosorg · Jul 20, 2023 · 54435ba · 54435ba
2 parents d7c4af1 + 91aadf0
commit 54435ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build/openjdk11/build.sh b/build/openjdk11/build.sh
@@ -18,8 +18,8 @@
 
 PROG=openjdk
 VER=11
-UPDATE=19
-BUILD=7
+UPDATE=20
+BUILD=8
 PKG=runtime/java/openjdk11
 SUMMARY="openjdk $VER"
 DESC="Open-source implementation of the eleventh edition of the "

diff --git a/build/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk b/build/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk
@@ -14,11 +14,11 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/make/lib/Awt2dLibraries.gmk a
      EXTRA_HEADER_DIRS := \
          common/awt/debug \
 @@ -554,8 +553,12 @@ else
-     HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES
+     HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES -DHB_NO_VISIBILITY
    endif
    ifeq ($(call isTargetOs, solaris), true)
 +   ifeq ($(TOOLCHAIN_TYPE), gcc)
-+    HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES
++    HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES -DHB_NO_VISIBILITY
 +   else
      HARFBUZZ_CFLAGS += -DHAVE_SOLARIS_ATOMIC_OPS
    endif