Skip to content

GitLab

I
icedtea
Commit 2c00ec7d authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Exclude library checks in icedtea 2.6.10 and 2.6.25 as they fail with glibc 2.35

parent 0a09534e
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 34 deletions
icedtea-2.6.10-fixed.patch
View file @ 2c00ec7d
diff -uNr icedtea-2.6.10/configure icedtea-2.6.10-fixed/configure
--- icedtea-2.6.10/configure 2017-05-17 12:48:59.353452900 +0930
+++ icedtea-2.6.10-fixed/configure 2024-01-18 15:41:01.177672233 +1030
--- icedtea-2.6.10/configure 2017-05-17 03:18:59.353452900 +0000
+++ icedtea-2.6.10-fixed/configure 2026-06-06 11:33:25.557758949 +0000
@@ -15851,7 +15851,7 @@
fi
done
......@@ -20,32 +20,32 @@ diff -uNr icedtea-2.6.10/configure icedtea-2.6.10-fixed/configure
done
diff -uNr icedtea-2.6.10/Makefile.am icedtea-2.6.10-fixed/Makefile.am
--- icedtea-2.6.10/Makefile.am 2017-05-17 12:48:00.046401098 +0930
+++ icedtea-2.6.10-fixed/Makefile.am 2024-01-18 15:50:14.608044670 +1030
--- icedtea-2.6.10/Makefile.am 2017-05-17 03:18:00.046401098 +0000
+++ icedtea-2.6.10-fixed/Makefile.am 2026-06-06 11:42:53.118449175 +0000
@@ -372,7 +372,7 @@
# Patch list
-ICEDTEA_PATCHES =
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/glibc-deprecated-sysctl.patch patches/jdk-fixed_xattr.patch patches/jdk-fix_GenerateCurrencyData.patch patches/sharedRuntime_aarch64-fix.patch
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/glibc-deprecated-sysctl.patch patches/jdk-fixed_xattr.patch patches/jdk-fix_GenerateCurrencyData.patch patches/sharedRuntime_aarch64-fix.patch patches/skip_ld_test.patch
# Conditional patches
diff -uNr icedtea-2.6.10/Makefile.in icedtea-2.6.10-fixed/Makefile.in
--- icedtea-2.6.10/Makefile.in 2017-05-17 12:49:00.769430260 +0930
+++ icedtea-2.6.10-fixed/Makefile.in 2024-01-18 15:50:27.907765231 +1030
--- icedtea-2.6.10/Makefile.in 2017-05-17 03:19:00.769430260 +0000
+++ icedtea-2.6.10-fixed/Makefile.in 2026-06-06 11:43:45.615985517 +0000
@@ -786,7 +786,7 @@
MIME_TYPE_CHECK_SRCS = $(top_srcdir)/test/standalone/RH1195203.java
# Patch list
-ICEDTEA_PATCHES = $(am__append_8) $(am__append_9) $(am__append_10) \
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/glibc-deprecated-sysctl.patch patches/jdk-fixed_xattr.patch patches/jdk-fix_GenerateCurrencyData.patch patches/sharedRuntime_aarch64-fix.patch $(am__append_8) $(am__append_9) $(am__append_10) \
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/glibc-deprecated-sysctl.patch patches/jdk-fixed_xattr.patch patches/jdk-fix_GenerateCurrencyData.patch patches/sharedRuntime_aarch64-fix.patch patches/skip_ld_test.patch $(am__append_8) $(am__append_9) $(am__append_10) \
$(am__append_11) $(am__append_12) $(am__append_13) \
$(am__append_14) $(DISTRIBUTION_PATCHES)
diff -uNr icedtea-2.6.10/patches/freetypecheck_fix.patch icedtea-2.6.10-fixed/patches/freetypecheck_fix.patch
--- icedtea-2.6.10/patches/freetypecheck_fix.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.10-fixed/patches/freetypecheck_fix.patch 2024-01-18 15:41:01.182672128 +1030
--- icedtea-2.6.10/patches/freetypecheck_fix.patch 1970-01-01 00:00:00.000000000 +0000
+++ icedtea-2.6.10-fixed/patches/freetypecheck_fix.patch 2026-06-06 11:33:25.557758949 +0000
@@ -0,0 +1,34 @@
+diff -uNr openjdk/jdk/make/common/shared/Sanity.gmk openjdk.fixed/jdk/make/common/shared/Sanity.gmk
+--- openjdk/jdk/make/common/shared/Sanity.gmk 2016-12-30 15:00:21.000000000 +1030
......@@ -82,8 +82,8 @@ diff -uNr icedtea-2.6.10/patches/freetypecheck_fix.patch icedtea-2.6.10-fixed/pa
+ ######################################################
+ # CUPS_HEADERS_PATH must be valid
diff -uNr icedtea-2.6.10/patches/glibc-deprecated-sysctl.patch icedtea-2.6.10-fixed/patches/glibc-deprecated-sysctl.patch
--- icedtea-2.6.10/patches/glibc-deprecated-sysctl.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.10-fixed/patches/glibc-deprecated-sysctl.patch 2024-01-18 15:41:01.182672128 +1030
--- icedtea-2.6.10/patches/glibc-deprecated-sysctl.patch 1970-01-01 00:00:00.000000000 +0000
+++ icedtea-2.6.10-fixed/patches/glibc-deprecated-sysctl.patch 2026-06-06 11:33:25.557758949 +0000
@@ -0,0 +1,22 @@
+diff -uNr openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk.fixed/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+--- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2017-05-03 12:20:28.000000000 +0930
......@@ -108,8 +108,8 @@ diff -uNr icedtea-2.6.10/patches/glibc-deprecated-sysctl.patch icedtea-2.6.10-fi
+
+ #include "jvm.h"
diff -uNr icedtea-2.6.10/patches/jdk-fixed_xattr.patch icedtea-2.6.10-fixed/patches/jdk-fixed_xattr.patch
--- icedtea-2.6.10/patches/jdk-fixed_xattr.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.10-fixed/patches/jdk-fixed_xattr.patch 2024-01-18 15:41:01.182672128 +1030
--- icedtea-2.6.10/patches/jdk-fixed_xattr.patch 1970-01-01 00:00:00.000000000 +0000
+++ icedtea-2.6.10-fixed/patches/jdk-fixed_xattr.patch 2026-06-06 11:33:25.557758949 +0000
@@ -0,0 +1,12 @@
+diff -uNr openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c openjdk.fixed/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c
+--- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c 2017-05-03 12:20:28.000000000 +0930
......@@ -124,8 +124,8 @@ diff -uNr icedtea-2.6.10/patches/jdk-fixed_xattr.patch icedtea-2.6.10-fixed/patc
+ #include <syscalls_fp.h>
+ #endif
diff -uNr icedtea-2.6.10/patches/jdk-fix_GenerateCurrencyData.patch icedtea-2.6.10-fixed/patches/jdk-fix_GenerateCurrencyData.patch
--- icedtea-2.6.10/patches/jdk-fix_GenerateCurrencyData.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.10-fixed/patches/jdk-fix_GenerateCurrencyData.patch 2024-01-18 15:49:03.375541262 +1030
--- icedtea-2.6.10/patches/jdk-fix_GenerateCurrencyData.patch 1970-01-01 00:00:00.000000000 +0000
+++ icedtea-2.6.10-fixed/patches/jdk-fix_GenerateCurrencyData.patch 2026-06-06 11:33:25.557758949 +0000
@@ -0,0 +1,14 @@
+diff -uNr openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk-fix_GenerateCurrencyData/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
+--- openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java 2017-05-03 12:20:28.000000000 +0930
......@@ -142,8 +142,8 @@ diff -uNr icedtea-2.6.10/patches/jdk-fix_GenerateCurrencyData.patch icedtea-2.6.
+ specialCaseCutOverTimes[specialCaseCount] = time;
+ specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
diff -uNr icedtea-2.6.10/patches/sharedRuntime_aarch64-fix.patch icedtea-2.6.10-fixed/patches/sharedRuntime_aarch64-fix.patch
--- icedtea-2.6.10/patches/sharedRuntime_aarch64-fix.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.10-fixed/patches/sharedRuntime_aarch64-fix.patch 2024-01-18 15:41:01.183672107 +1030
--- icedtea-2.6.10/patches/sharedRuntime_aarch64-fix.patch 1970-01-01 00:00:00.000000000 +0000
+++ icedtea-2.6.10-fixed/patches/sharedRuntime_aarch64-fix.patch 2026-06-06 11:33:25.557758949 +0000
@@ -0,0 +1,14 @@
+diff -uNr openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp openjdk.fixed/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
+--- openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp 2017-05-03 02:50:28.000000000 +0000
......@@ -159,3 +159,26 @@ diff -uNr icedtea-2.6.10/patches/sharedRuntime_aarch64-fix.patch icedtea-2.6.10-
+ // ---------------------------------------------------------------------------
+ // Read the array of BasicTypes from a signature, and compute where the
+ // arguments should go. Values in the VMRegPair regs array refer to 4-byte
diff -uNr icedtea-2.6.10/patches/skip_ld_test.patch icedtea-2.6.10-fixed/patches/skip_ld_test.patch
--- icedtea-2.6.10/patches/skip_ld_test.patch 1970-01-01 00:00:00.000000000 +0000
+++ icedtea-2.6.10-fixed/patches/skip_ld_test.patch 2026-06-06 11:40:48.138787972 +0000
@@ -0,0 +1,19 @@
+diff -uNr openjdk/jdk/make/common/Library.gmk openjdk.fixed/jdk/make/common/Library.gmk
+--- openjdk/jdk/make/common/Library.gmk 2017-05-03 02:50:28.000000000 +0000
++++ openjdk.fixed/jdk/make/common/Library.gmk 2026-06-06 11:40:12.673747965 +0000
+@@ -182,7 +182,6 @@
+ $(LFLAGS) @$(OBJDIR)/$(LIBRARY).lcf \
+ $(OTHER_LCF) $(LDLIBS)
+ $(CP) $(OBJDIR)/$(@F) $@
+- @$(call binary_file_verification,$@)
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ (set -e ; \
+@@ -262,7 +261,6 @@
+ $(AR) $(ARFLAGS) $@ $(FILES_o)
+ else # LIBRARY
+ $(LINKER) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS)
+- @$(call binary_file_verification,$@)
+ ifeq ($(WRITE_LIBVERSION),true)
+ $(MCS) -d -a "$(FULL_VERSION)" $@
+ endif # WRITE_LIBVERSION
icedtea-2.6.25-fixed.patch
View file @ 2c00ec7d
diff -uNr icedtea-2.6.25/configure icedtea-2.6.25-fixed/configure
--- icedtea-2.6.25/configure 2021-02-12 14:42:53.012788536 +1030
+++ icedtea-2.6.25-fixed/configure 2024-01-18 15:58:48.458252504 +1030
--- icedtea-2.6.25/configure 2021-02-12 04:12:53.012788536 +0000
+++ icedtea-2.6.25-fixed/configure 2026-06-07 02:12:05.497711012 +0000
@@ -16089,7 +16089,7 @@
fi
done
......@@ -20,33 +20,33 @@ diff -uNr icedtea-2.6.25/configure icedtea-2.6.25-fixed/configure
done
diff -uNr icedtea-2.6.25/Makefile.am icedtea-2.6.25-fixed/Makefile.am
--- icedtea-2.6.25/Makefile.am 2021-02-12 14:41:14.067670731 +1030
+++ icedtea-2.6.25-fixed/Makefile.am 2024-01-18 16:00:36.393991087 +1030
--- icedtea-2.6.25/Makefile.am 2021-02-12 04:11:14.067670731 +0000
+++ icedtea-2.6.25-fixed/Makefile.am 2026-06-07 02:14:11.597468110 +0000
@@ -369,7 +369,7 @@
# Patch list
-ICEDTEA_PATCHES =
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/glibc-deprecated-sysctl.patch patches/jdk-fixed_xattr.patch patches/jdk-fix_GenerateCurrencyData.patch
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/glibc-deprecated-sysctl.patch patches/jdk-fixed_xattr.patch patches/jdk-fix_GenerateCurrencyData.patch patches/skip_ld_test.patch
# Conditional patches
diff -uNr icedtea-2.6.25/Makefile.in icedtea-2.6.25-fixed/Makefile.in
--- icedtea-2.6.25/Makefile.in 2021-02-12 14:42:54.507805425 +1030
+++ icedtea-2.6.25-fixed/Makefile.in 2024-01-18 16:00:53.274637412 +1030
--- icedtea-2.6.25/Makefile.in 2021-02-12 04:12:54.507805425 +0000
+++ icedtea-2.6.25-fixed/Makefile.in 2026-06-07 02:14:28.033957506 +0000
@@ -788,7 +788,8 @@
MIME_TYPE_CHECK_SRCS = $(top_srcdir)/test/standalone/RH1195203.java
# Patch list
-ICEDTEA_PATCHES = $(am__append_8) $(am__append_9) $(am__append_10) \
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/glibc-deprecated-sysctl.patch patches/jdk-fixed_xattr.patch patches/jdk-fix_GenerateCurrencyData.patch \
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/glibc-deprecated-sysctl.patch patches/jdk-fixed_xattr.patch patches/jdk-fix_GenerateCurrencyData.patch patches/skip_ld_test.patch \
+ $(am__append_8) $(am__append_9) $(am__append_10) \
$(am__append_11) $(am__append_12) $(am__append_13) \
$(DISTRIBUTION_PATCHES)
diff -uNr icedtea-2.6.25/patches/freetypecheck_fix.patch icedtea-2.6.25-fixed/patches/freetypecheck_fix.patch
--- icedtea-2.6.25/patches/freetypecheck_fix.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.25-fixed/patches/freetypecheck_fix.patch 2024-01-18 15:58:48.468252294 +1030
--- icedtea-2.6.25/patches/freetypecheck_fix.patch 1970-01-01 00:00:00.000000000 +0000
+++ icedtea-2.6.25-fixed/patches/freetypecheck_fix.patch 2026-06-07 02:12:05.501711131 +0000
@@ -0,0 +1,34 @@
+diff -uNr openjdk/jdk/make/common/shared/Sanity.gmk openjdk.fixed/jdk/make/common/shared/Sanity.gmk
+--- openjdk/jdk/make/common/shared/Sanity.gmk 2016-12-30 15:00:21.000000000 +1030
......@@ -83,8 +83,8 @@ diff -uNr icedtea-2.6.25/patches/freetypecheck_fix.patch icedtea-2.6.25-fixed/pa
+ ######################################################
+ # CUPS_HEADERS_PATH must be valid
diff -uNr icedtea-2.6.25/patches/glibc-deprecated-sysctl.patch icedtea-2.6.25-fixed/patches/glibc-deprecated-sysctl.patch
--- icedtea-2.6.25/patches/glibc-deprecated-sysctl.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.25-fixed/patches/glibc-deprecated-sysctl.patch 2024-01-18 15:58:48.469252273 +1030
--- icedtea-2.6.25/patches/glibc-deprecated-sysctl.patch 1970-01-01 00:00:00.000000000 +0000
+++ icedtea-2.6.25-fixed/patches/glibc-deprecated-sysctl.patch 2026-06-07 02:12:05.501711131 +0000
@@ -0,0 +1,22 @@
+diff -uNr openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk.fixed/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+--- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2021-02-10 16:22:36.000000000 +1030
......@@ -109,8 +109,8 @@ diff -uNr icedtea-2.6.25/patches/glibc-deprecated-sysctl.patch icedtea-2.6.25-fi
+
+ #include "jvm.h"
diff -uNr icedtea-2.6.25/patches/jdk-fixed_xattr.patch icedtea-2.6.25-fixed/patches/jdk-fixed_xattr.patch
--- icedtea-2.6.25/patches/jdk-fixed_xattr.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.25-fixed/patches/jdk-fixed_xattr.patch 2024-01-18 15:58:48.470252252 +1030
--- icedtea-2.6.25/patches/jdk-fixed_xattr.patch 1970-01-01 00:00:00.000000000 +0000
+++ icedtea-2.6.25-fixed/patches/jdk-fixed_xattr.patch 2026-06-07 02:12:05.501711131 +0000
@@ -0,0 +1,12 @@
+diff -uNr openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c openjdk.fixed/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c
+--- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c 2017-05-03 12:20:28.000000000 +0930
......@@ -125,8 +125,8 @@ diff -uNr icedtea-2.6.25/patches/jdk-fixed_xattr.patch icedtea-2.6.25-fixed/patc
+ #include <syscalls_fp.h>
+ #endif
diff -uNr icedtea-2.6.25/patches/jdk-fix_GenerateCurrencyData.patch icedtea-2.6.25-fixed/patches/jdk-fix_GenerateCurrencyData.patch
--- icedtea-2.6.25/patches/jdk-fix_GenerateCurrencyData.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.25-fixed/patches/jdk-fix_GenerateCurrencyData.patch 2024-01-18 15:58:02.278220055 +1030
--- icedtea-2.6.25/patches/jdk-fix_GenerateCurrencyData.patch 1970-01-01 00:00:00.000000000 +0000
+++ icedtea-2.6.25-fixed/patches/jdk-fix_GenerateCurrencyData.patch 2026-06-07 02:12:05.501711131 +0000
@@ -0,0 +1,14 @@
+diff -uNr openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk.fixed/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
+--- openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java 2021-02-10 16:22:36.000000000 +1030
......@@ -142,3 +142,26 @@ diff -uNr icedtea-2.6.25/patches/jdk-fix_GenerateCurrencyData.patch icedtea-2.6.
+ }
+ specialCaseCutOverTimes[specialCaseCount] = time;
+ specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
diff -uNr icedtea-2.6.25/patches/skip_ld_test.patch icedtea-2.6.25-fixed/patches/skip_ld_test.patch
--- icedtea-2.6.25/patches/skip_ld_test.patch 1970-01-01 00:00:00.000000000 +0000
+++ icedtea-2.6.25-fixed/patches/skip_ld_test.patch 2026-06-07 02:11:40.616969121 +0000
@@ -0,0 +1,19 @@
+diff -uNr openjdk/jdk/make/common/Library.gmk openjdk.fixed/jdk/make/common/Library.gmk
+--- openjdk/jdk/make/common/Library.gmk 2017-05-03 02:50:28.000000000 +0000
++++ openjdk.fixed/jdk/make/common/Library.gmk 2026-06-06 11:40:12.673747965 +0000
+@@ -182,7 +182,6 @@
+ $(LFLAGS) @$(OBJDIR)/$(LIBRARY).lcf \
+ $(OTHER_LCF) $(LDLIBS)
+ $(CP) $(OBJDIR)/$(@F) $@
+- @$(call binary_file_verification,$@)
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ (set -e ; \
+@@ -262,7 +261,6 @@
+ $(AR) $(ARFLAGS) $@ $(FILES_o)
+ else # LIBRARY
+ $(LINKER) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS)
+- @$(call binary_file_verification,$@)
+ ifeq ($(WRITE_LIBVERSION),true)
+ $(MCS) -d -a "$(FULL_VERSION)" $@
+ endif # WRITE_LIBVERSION
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment