Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

openjdk updates (r151046) #3295

Merged
merged 2 commits into from
Jul 20, 2023
Merged

openjdk updates (r151046) #3295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1993f50
openjdk11: update to 11.0.20+8
hadfl Jul 20, 2023
c7756e2
openjdk17: update to 17.0.8+7
hadfl Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/openjdk11/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down
4 changes: 2 additions & 2 deletions build/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/openjdk17/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

PROG=openjdk
VER=17
UPDATE=7
UPDATE=8
BUILD=7
PKG=runtime/java/openjdk17
SUMMARY="openjdk $VER"
Expand Down
30 changes: 29 additions & 1 deletion build/openjdk17/patches/java-solaris-sparc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@
endif
+ ifeq ($(call isTargetOs, linux macosx), true)
- ifeq ($(call isTargetOs, solaris linux macosx), true)
HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES
HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES -DHB_NO_VISIBILITY
endif

@@ -608,10 +606,7 @@
Expand Down Expand Up @@ -28718,3 +28718,31 @@
-{
- return -1;
-}
--- old/make/data/charsetmapping/stdcs-solaris Wed Jul 19 17:51:02 2023
+++ /dev/null Wed Jul 19 17:36:26 2023
@@ -1,25 +0,0 @@
-#
-# generate these charsets into sun.nio.cs
-#
-Big5
-Big5_Solaris
-Big5_HKSCS # always together with Big5
-EUC_CN
-EUC_KR
-EUC_JP
-EUC_JP_LINUX
-EUC_JP_Open
-EUC_TW
-GBK
-ISO_8859_11
-ISO_8859_3
-ISO_8859_6
-ISO_8859_8
-Johab
-PCK
-TIS_620
-JIS_X_0201
-JIS_X_0208
-JIS_X_0212
-JIS_X_0208_Solaris
-JIS_X_0212_Solaris
Loading