diff --git a/0001-Allow-devkit-to-work-with-RHEL.patch b/0001-Allow-devkit-to-work-with-RHEL.patch new file mode 100644 index 0000000..2f65815 --- /dev/null +++ b/0001-Allow-devkit-to-work-with-RHEL.patch @@ -0,0 +1,54 @@ +From 7733d625ebdea5a6f323a0c5944fb8ab728d1b2b Mon Sep 17 00:00:00 2001 +From: Andrew Hughes +Date: Sat, 25 Nov 2023 17:29:36 +0000 +Subject: [PATCH] Allow devkit to work with RHEL + +--- + make/devkit/Makefile | 2 +- + make/devkit/Tools.gmk | 10 +++++++++- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/make/devkit/Makefile b/make/devkit/Makefile +index c85a7c21d29..8f69d23c325 100644 +--- a/make/devkit/Makefile ++++ b/make/devkit/Makefile +@@ -58,7 +58,7 @@ + COMMA := , + + os := $(shell uname -o) +-cpu := $(shell uname -p) ++cpu := $(shell uname -m) + + # Figure out what platform this is building on. + me := $(cpu)-$(if $(findstring Linux,$(os)),linux-gnu) +diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk +index 187320ca26e..001f4b1870c 100644 +--- a/make/devkit/Tools.gmk ++++ b/make/devkit/Tools.gmk +@@ -62,6 +62,14 @@ ifeq ($(BASE_OS), OL) + BASE_URL := http://yum.oracle.com/repo/OracleLinux/OL6/4/base/$(ARCH)/ + LINUX_VERSION := OL6.4 + endif ++else ifeq ($(BASE_OS), RHEL) ++ ifeq ($(ARCH), aarch64) ++ BASE_URL := https://download.eng.brq.redhat.com/rhel-7/rel-eng/RHEL-7/latest-RHEL-ALT-7/compose/Server/$(ARCH)/os/Packages/ ++ LINUX_VERSION := RHEL7.6 ++ else ++ BASE_URL := https://download.eng.brq.redhat.com/rhel-7/rel-eng/RHEL-7/latest-RHEL-7/compose/Server/$(ARCH)/os/Packages/ ++ LINUX_VERSION := RHEL7.9 ++ endif + else ifeq ($(BASE_OS), Fedora) + ifeq ($(ARCH), riscv64) + DEFAULT_OS_VERSION := rawhide/68692 +@@ -246,7 +254,7 @@ download-rpms: + # Only run this if rpm dir is empty. + ifeq ($(wildcard $(DOWNLOAD_RPMS)/*.rpm), ) + cd $(DOWNLOAD_RPMS) && \ +- wget -r -np -nd $(patsubst %, -A "*%*.rpm", $(RPM_LIST)) $(BASE_URL) ++ wget -r -e robots=off -np -nd $(patsubst %, -A "*%*.rpm", $(RPM_LIST)) $(BASE_URL) + endif + + ########################################################################################## +-- +2.45.2 + diff --git a/0002-Disable-multilib-on-x86_64.patch b/0002-Disable-multilib-on-x86_64.patch new file mode 100644 index 0000000..0459b06 --- /dev/null +++ b/0002-Disable-multilib-on-x86_64.patch @@ -0,0 +1,50 @@ +From e55afc691c0105623e04a6e76369cf1438afb874 Mon Sep 17 00:00:00 2001 +From: Andrew Hughes +Date: Fri, 8 Dec 2023 21:22:02 +0000 +Subject: [PATCH] Disable multilib on x86_64 + +--- + make/devkit/Tools.gmk | 13 +++---------- + 1 file changed, 3 insertions(+), 10 deletions(-) + +diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk +index 001f4b1870c..9ede781413d 100644 +--- a/make/devkit/Tools.gmk ++++ b/make/devkit/Tools.gmk +@@ -225,13 +225,7 @@ RPM_LIST := \ + ########################################################################################## + # Define common directories and files + +-# Ensure we have 32-bit libs also for x64. We enable mixed-mode. +-ifeq (x86_64,$(ARCH)) +- LIBDIRS := lib64 lib +- CFLAGS_lib := -m32 +-else +- LIBDIRS := lib +-endif ++LIBDIRS := lib + + # Define directories + BUILDDIR := $(OUTPUT_ROOT)/$(HOST)/$(TARGET) +@@ -289,8 +283,7 @@ $(foreach p,GCC BINUTILS CCACHE MPFR GMP MPC GDB,$(eval $(call Download,$(p)))) + + RPM_ARCHS := $(ARCH) noarch + ifeq ($(ARCH),x86_64) +- # Enable mixed mode. +- RPM_ARCHS += i386 i686 ++ RPM_ARCHS += i686 + else ifeq ($(ARCH),i686) + RPM_ARCHS += i386 + else ifeq ($(ARCH), armhfp) +@@ -526,7 +519,7 @@ ifeq ($(ARCH), armhfp) + $(BUILDDIR)/$(gcc_ver)/Makefile : CONFIG += --with-float=hard + endif + +-ifneq ($(filter riscv64 ppc64 ppc64le s390x, $(ARCH)), ) ++ifneq ($(filter riscv64 ppc64 ppc64le s390x x86_64, $(ARCH)), ) + # We only support 64-bit on these platforms anyway + CONFIG += --disable-multilib + endif +-- +2.45.2 + diff --git a/0003-Log-devkit-build-to-stdout.patch b/0003-Log-devkit-build-to-stdout.patch new file mode 100644 index 0000000..a508301 --- /dev/null +++ b/0003-Log-devkit-build-to-stdout.patch @@ -0,0 +1,92 @@ +From fbc27183b35df7778cf106450b144474f8e2a35c Mon Sep 17 00:00:00 2001 +From: Andrew Hughes +Date: Wed, 30 Oct 2024 00:42:06 +0000 +Subject: [PATCH] Log devkit build to stdout + +Resolves: OPENJDK-3071 +--- + make/devkit/Tools.gmk | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk +index 9ede781413d..b6f895f5a25 100644 +--- a/make/devkit/Tools.gmk ++++ b/make/devkit/Tools.gmk +@@ -458,7 +458,7 @@ $(BUILDDIR)/$(binutils_ver)/Makefile \ + --enable-multilib \ + --enable-threads \ + --enable-plugins \ +- ) > $(@D)/log.config 2>&1 ++ ) 2>&1 | tee $(@D)/log.config + @echo 'done' + + $(BUILDDIR)/$(mpfr_ver)/Makefile \ +@@ -473,7 +473,7 @@ $(BUILDDIR)/$(mpfr_ver)/Makefile \ + --program-prefix=$(TARGET)- \ + --enable-shared=no \ + --with-gmp=$(PREFIX) \ +- ) > $(@D)/log.config 2>&1 ++ ) 2>&1 | tee $(@D)/log.config + @echo 'done' + + $(BUILDDIR)/$(gmp_ver)/Makefile \ +@@ -490,7 +490,7 @@ $(BUILDDIR)/$(gmp_ver)/Makefile \ + --program-prefix=$(TARGET)- \ + --enable-shared=no \ + --with-mpfr=$(PREFIX) \ +- ) > $(@D)/log.config 2>&1 ++ ) 2>&1 | tee $(@D)/log.config + @echo 'done' + + $(BUILDDIR)/$(mpc_ver)/Makefile \ +@@ -506,7 +506,7 @@ $(BUILDDIR)/$(mpc_ver)/Makefile \ + --enable-shared=no \ + --with-mpfr=$(PREFIX) \ + --with-gmp=$(PREFIX) \ +- ) > $(@D)/log.config 2>&1 ++ ) 2>&1 | tee $(@D)/log.config + @echo 'done' + + # Only valid if glibc target -> linux +@@ -549,7 +549,7 @@ $(BUILDDIR)/$(gcc_ver)/Makefile \ + --with-mpfr=$(PREFIX) \ + --with-gmp=$(PREFIX) \ + --with-mpc=$(PREFIX) \ +- ) > $(@D)/log.config 2>&1 ++ ) 2>&1 | tee $(@D)/log.config + @echo 'done' + + # need binutils for gcc +@@ -571,7 +571,7 @@ ifeq ($(HOST), $(TARGET)) + $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" $(GDB_CFG) \ + $(CONFIG) \ + --with-sysroot=$(SYSROOT) \ +- ) > $(@D)/log.config 2>&1 ++ ) 2>&1 | tee $(@D)/log.config + @echo 'done' + + $(gdb): $(gcc) +@@ -593,7 +593,7 @@ $(BUILDDIR)/$(ccache_ver)/Makefile \ + cd $(@D) ; \ + $(PATHPRE) $(ENVS) $(CCACHE_CFG) \ + $(CONFIG) \ +- ) > $(@D)/log.config 2>&1 ++ ) 2>&1 | tee $(@D)/log.config + @echo 'done' + + gccpatch = $(TARGETDIR)/gcc-patched +@@ -641,9 +641,9 @@ endif + # Always need to build cross tools for build host self. + $(TARGETDIR)/%.done : $(BUILDDIR)/%/Makefile + $(info Building $(basename $@). Log in $( $(&1 ++ $(PATHPRE) $(ENVS) $(MAKE) $(BUILDPAR) -f $< -C $(&1 | tee $( $(&1 ++ $(PATHPRE) $(MAKE) $(INSTALLPAR) -f $< -C $(&1 | tee $( +Date: Wed, 20 Mar 2024 13:01:47 -0400 +Subject: [PATCH] devkit: Remove .comment sections from sysroot objects + +Otherwise the comment sections of C runtime objects, including those +in static libraries like libc_nonshared.a, contribute RPM package +version strings to the .comment section in devkit-produced binaries +and libraries. These RPM package strings change frequently, even +across minor toolchain updates. Their presence interferes when +comparing binaries built with devkits that use different sysroot RPM +package sets. +--- + make/devkit/Tools.gmk | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk +index b6f895f5a25..37ea1a6a287 100644 +--- a/make/devkit/Tools.gmk ++++ b/make/devkit/Tools.gmk +@@ -324,6 +324,9 @@ $(foreach p,$(RPM_FILE_LIST),$(eval $(call unrpm,$(p)))) + # have it anyway, but just to make sure... + # Patch libc.so and libpthread.so to force linking against libraries in sysroot + # and not the ones installed on the build machine. ++# Remove comment sections from static libraries and C runtime objects ++# to prevent leaking RHEL-specific package versions into ++# devkit-produced binaries. + $(libs) : $(rpms) + @echo Patching libc and pthreads + @(for f in `find $(SYSROOT) -name libc.so -o -name libpthread.so`; do \ +@@ -333,6 +336,7 @@ $(libs) : $(rpms) + -e 's|/lib/||g' ) > $$f.tmp ; \ + mv $$f.tmp $$f ; \ + done) ++ @find $(SYSROOT) -name '*.[ao]' -exec objcopy --remove-section .comment '{}' ';' + @mkdir -p $(SYSROOT)/usr/lib + @touch $@ + +-- +2.45.2 + diff --git a/0005-Tools.gmk-Configure-binutils-with-enable-determinist.patch b/0005-Tools.gmk-Configure-binutils-with-enable-determinist.patch new file mode 100644 index 0000000..005c8b6 --- /dev/null +++ b/0005-Tools.gmk-Configure-binutils-with-enable-determinist.patch @@ -0,0 +1,35 @@ +From c370e1194c707f3f6c470e147ec497cc4e76957e Mon Sep 17 00:00:00 2001 +From: Thomas Fitzsimmons +Date: Fri, 22 Mar 2024 16:03:17 -0400 +Subject: [PATCH] Tools.gmk: Configure binutils with + --enable-deterministic-archives + +--- + make/devkit/Tools.gmk | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk +index 37ea1a6a287..22c6007000b 100644 +--- a/make/devkit/Tools.gmk ++++ b/make/devkit/Tools.gmk +@@ -445,6 +445,9 @@ endif + + # Makefile creation. Simply run configure in build dir. + # Setting CFLAGS to -O2 generates a much faster ld. ++# Use --enable-deterministic-archives so that make targets that ++# generate "ar" archives, such as "static-libs-image", produce ++# deterministic .a files. + $(bfdmakes) \ + $(BUILDDIR)/$(binutils_ver)/Makefile \ + : $(BINUTILS_CFG) +@@ -459,6 +462,7 @@ $(BUILDDIR)/$(binutils_ver)/Makefile \ + --with-sysroot=$(SYSROOT) \ + --disable-nls \ + --program-prefix=$(TARGET)- \ ++ --enable-deterministic-archives \ + --enable-multilib \ + --enable-threads \ + --enable-plugins \ +-- +2.45.2 + diff --git a/0006-Tools.gmk-Add-enable-linker-build-id-to-gcc-build.patch b/0006-Tools.gmk-Add-enable-linker-build-id-to-gcc-build.patch new file mode 100644 index 0000000..367c79c --- /dev/null +++ b/0006-Tools.gmk-Add-enable-linker-build-id-to-gcc-build.patch @@ -0,0 +1,35 @@ +From 5958274571b957617d0572101a92217fd5b2f312 Mon Sep 17 00:00:00 2001 +From: Andrew Hughes +Date: Wed, 27 Nov 2024 17:04:19 +0000 +Subject: [PATCH] Tools.gmk: Add --enable-linker-build-id to gcc build + +This causes --build-id to be passed to the linker, and the +.note.gnu.build-id section is added (OPENJDK-3068) +--- + make/devkit/Tools.gmk | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk +index 22c6007000b..57d48ec5114 100644 +--- a/make/devkit/Tools.gmk ++++ b/make/devkit/Tools.gmk +@@ -539,6 +539,8 @@ endif + # skip native language. + # and link and assemble with the binutils we created + # earlier, so --with-gnu* ++# Add --enable-linker-build-id so the .note.gnu.build-id ++# section is added by the linker (OPENJDK-3068) + $(BUILDDIR)/$(gcc_ver)/Makefile \ + : $(GCC_CFG) + $(info Configuring $@. Log in $(@D)/log.config) +@@ -557,6 +559,7 @@ $(BUILDDIR)/$(gcc_ver)/Makefile \ + --with-mpfr=$(PREFIX) \ + --with-gmp=$(PREFIX) \ + --with-mpc=$(PREFIX) \ ++ --enable-linker-build-id \ + ) 2>&1 | tee $(@D)/log.config + @echo 'done' + +-- +2.45.2 + diff --git a/README.md b/README.md index cf5e219..57cc9fc 100644 --- a/README.md +++ b/README.md @@ -37,3 +37,11 @@ need to be modified if the version or rpmrelease values are changed in To reduce the number of RPMs involved, the `fastdebug` and `slowdebug` builds may be disabled using `--without fastdebug` and `--without slowdebug`. + +By default, the portable build on RHEL also uses a "devkit" (a +toolchain and system libraries) to build. This aids reproducibility +by removing build differences caused by differing system toolchains +and libraries. This dependency can be dropped by removing the +architecture from the definition of `devkit_arches` in the +`java-21-openjdk-portable.specfile` or a devkit can be built using the +`openjdk-devkit.specfile` and associated patches. diff --git a/java-21-openjdk-portable.specfile b/java-21-openjdk-portable.specfile index 3c0a46a..93a5b8b 100644 --- a/java-21-openjdk-portable.specfile +++ b/java-21-openjdk-portable.specfile @@ -31,7 +31,9 @@ # This is RHEL 7 specific as it doesn't seem to have the # __brp_strip_static_archive macro. +%if 0%{?rhel} == 7 %define __os_install_post %{nil} +%endif # Workaround for stripping of debug symbols from static libraries %if %{with staticlibs} @@ -56,6 +58,10 @@ # See: https://bugzilla.redhat.com/show_bug.cgi?id=1520879 %global _find_debuginfo_opts -g +# Disable LTO as this causes build failures at the moment. +# See RHBZ#1861401 +%define _lto_cflags %{nil} + # note: parametrized macros are order-sensitive (unlike not-parametrized) even with normal macros # also necessary when passing it as parameter to other macros. If not macro, then it is considered a switch # see the difference between global and define: @@ -142,7 +148,7 @@ %global zgc_arches x86_64 # Set of architectures for which alt-java has SSB mitigation %global ssbd_arches x86_64 -# Set of architectures for which java has short vector math library (libsvml.so) +# Set of architectures for which java has short vector math library (libjsvml.so) %global svml_arches x86_64 # Set of architectures where we verify backtraces with gdb # s390x fails on RHEL 7 so we exclude it there @@ -153,6 +159,8 @@ %endif # Architecture on which we run Java only tests %global jdk_test_arch x86_64 +# Set of architectures for which we have a devkit +%global devkit_arches %{aarch64} %{ppc64le} s390x x86_64 # By default, we build a slowdebug build during main build on JIT architectures %if %{with slowdebug} @@ -233,11 +241,9 @@ %global hotspot_target hotspot # DTS toolset to use to provide gcc & binutils +%if 0%{?rhel} == 7 %global dtsversion 10 - -# Disable LTO as this causes build failures at the moment. -# See RHBZ#1861401 -%define _lto_cflags %{nil} +%endif # Filter out flags from the optflags macro that cause problems with the OpenJDK build # We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2 @@ -382,7 +388,7 @@ %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 11 -%global rpmrelease 1 +%global rpmrelease 2 #%%global tagsuffix %%{nil} # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit %if %is_system_jdk @@ -486,6 +492,7 @@ %define jrebindir() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/bin} %global alt_java_name alt-java +%global devkit_name %{origin}-devkit %global rpm_state_dir %{_localstatedir}/lib/rpm-state/ @@ -520,10 +527,19 @@ # Prevent brp-java-repack-jars from being run %global __jar_repack 0 -# Define the architectures on which we build -ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64 -# Define the OS this package is built on + +# Define an optional suffix for the OS this package is built on +%if 0%{?rhel} == 7 %global pkgos rhel7 +%endif + +# Define the architectures on which we build +# On RHEL, this should be the architectures with a devkit +%if 0%{?centos} == 0 +ExclusiveArch: %{devkit_arches} +%else +ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64 +%endif Name: java-%{javaver}-%{origin}-portable%{?pkgos:-%{pkgos}} Version: %{newjavaver}.%{buildver} @@ -539,11 +555,6 @@ Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist} # provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0". Epoch: 1 - -# portables have grown out of its component, moving back to java-x-vendor -# this expression, when declared as global, filled component with java-x-vendor portable -%define component %(echo %{name} | sed "s;-portable%{?pkgos:-%{pkgos}};;g") - Summary: %{origin_nice} %{featurever} Runtime Environment portable edition # Groups are only used up to RHEL 8 and on Fedora versions prior to F30 %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) @@ -608,7 +619,6 @@ Source18: TestTranslations.java # RPM/distribution specific patches # ############################################ - # Crypto policy and FIPS support patches # Patch is generated from the fips-21u tree at https://github.com/rh-openjdk/jdk/tree/fips-21u # as follows: git diff %%{vcstag} src make test > fips-21u-$(git show -s --format=%h HEAD).patch @@ -661,6 +671,8 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch # ############################################# +# Currently empty + ############################################# # # Portable build specific patches @@ -679,9 +691,19 @@ BuildRequires: desktop-file-utils BuildRequires: elfutils-devel BuildRequires: file BuildRequires: fontconfig-devel +# RHEL 7 builds obtain a newer compiler from DTS +%if 0%{?rhel} == 7 BuildRequires: devtoolset-%{dtsversion}-gcc BuildRequires: devtoolset-%{dtsversion}-gcc-c++ +%else +%ifarch %{devkit_arches} +BuildRequires: %{devkit_name} >= 1.0-8 +%else +# Earlier versions have a bug in tree vectorization on PPC +BuildRequires: gcc >= 4.8.3-8 BuildRequires: gcc-c++ +%endif +%endif BuildRequires: gdb BuildRequires: libxslt BuildRequires: libX11-devel @@ -694,7 +716,7 @@ BuildRequires: libXtst-devel # Requirement for setting up nss.fips.cfg BuildRequires: nss-devel # Requirement for system security property test -# N/A for portable. RHEL7 doesn't provide them +# N/A for portable as we don't enable support for them #BuildRequires: crypto-policies BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel @@ -702,22 +724,20 @@ BuildRequires: zip # to pack portable tarballs BuildRequires: tar BuildRequires: unzip -BuildRequires: javapackages-tools +BuildRequires: javapackages-filesystem BuildRequires: java-%{buildjdkver}-%{origin}%{?pkgos:-%{pkgos}}-devel # Zero-assembler build requirement %ifarch %{zero_arches} BuildRequires: libffi-devel %endif # Full documentation build requirements -# pandoc is not available on RHEL 7 -%if 0%{?rhel} >= 8 +# pandoc is only available on RHEL/CentOS 8 +%if 0%{?rhel} == 8 BuildRequires: graphviz BuildRequires: pandoc %endif # cacerts build requirement in portable mode BuildRequires: ca-certificates -# Earlier versions have a bug in tree vectorization on PPC -BuildRequires: gcc >= 4.8.3-8 %if %{with_systemtap} BuildRequires: systemtap-sdt-devel @@ -748,8 +768,10 @@ Provides: bundled(libpng) = 1.6.43 # Version in src/java.base/share/native/libzip/zlib/zlib.h Provides: bundled(zlib) = 1.3.1 # We link statically against libstdc++ to increase portability +%ifnarch %{devkit_arches} BuildRequires: libstdc++-static %endif +%endif # this is always built, also during debug-only build # when it is built in debug-only this package is just placeholder @@ -894,10 +916,10 @@ The %{origin_nice} %{featurever} miscellany. echo "Preparing %{oj_vendor_version}" # Using the echo macro breaks rpmdev-bumpspec, as it parses the first line of stdout :-( -%if 0%{?_build_cpu:1} - echo "CPU: %{_target_cpu}, arch install directory: %{archinstall}, SystemTap install directory: %{_build_cpu}" +%if 0%{?stapinstall:1} + echo "CPU: %{_target_cpu}, arch install directory: %{archinstall}, SystemTap install directory: %{stapinstall}" %else - %{error:Unrecognised architecture %{_build_cpu}} + %{error:Unrecognised architecture %{_target_cpu}} %endif if [ %{include_normal_build} -eq 0 -o %{include_normal_build} -eq 1 ] ; then @@ -1006,8 +1028,20 @@ done # Prepare desktop files # Portables do not have desktop integration -%build +# Extract devkit +%ifarch %{devkit_arches} + devkittarball=%{_datadir}/%{devkit_name}/sdk-%{_target_cpu}-%{_target_os}-gnu*.tar.gz + echo "Extracting devkit ${devkittarball}"; + mkdir devkit; + tar -C devkit --strip-components=1 -xzf ${devkittarball} + DEVKIT_ROOT=$(pwd)/devkit + source ${DEVKIT_ROOT}/devkit.info + echo "Installed ${DEVKIT_NAME} devkit" +%else + echo "No devkit for %{_target_cpu}"; +%endif +%build # How many CPU's do we have? export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :) export NUM_PROC=${NUM_PROC:-1} @@ -1039,6 +1073,12 @@ EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-strict-aliasing" EXTRA_CFLAGS="$(echo ${EXTRA_CFLAGS} | sed -e 's|-mstackrealign|-mincoming-stack-boundary=2 -mpreferred-stack-boundary=4|')" EXTRA_CPP_FLAGS="$(echo ${EXTRA_CPP_FLAGS} | sed -e 's|-mstackrealign|-mincoming-stack-boundary=2 -mpreferred-stack-boundary=4|')" %endif +%ifarch %{devkit_arches} +# Remove annobin plugin reference which isn't available in the devkit +EXTRA_CFLAGS="$(echo ${EXTRA_CFLAGS} | sed -e 's|-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1||')" +EXTRA_CPP_FLAGS="$(echo ${EXTRA_CFLAGS} | sed -e 's|-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1||')" +%endif + export EXTRA_CFLAGS EXTRA_CPP_FLAGS # Set modification times (mtimes) of files within JAR files generated @@ -1086,16 +1126,6 @@ export EXTRA_CFLAGS EXTRA_CPP_FLAGS VERSION_FILE="$(pwd)"/"%{top_level_dir_name}"/make/conf/version-numbers.conf OPENJDK_UPSTREAM_TAG_EPOCH="$(stat --format=%Y "${VERSION_FILE}")" -echo "Building %{SOURCE11}" -mkdir -p %{altjavaoutputdir} -gcc ${EXTRA_CFLAGS} -o %{altjavaoutputdir}/%{alt_java_name} %{SOURCE11} -echo "Generating %{alt_java_name} man page" -altjavamanpage=%{altjavaoutputdir}/%{alt_java_name}.1 -echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > ${altjavamanpage} -cat %{top_level_dir_name}/src/java.base/share/man/java.1 >> ${altjavamanpage} - -echo "Building %{newjavaver}-%{buildver}, pre=%{ea_designator}, opt=%{lts_designator}" - function buildjdk() { local outputdir=${1} local buildjdk=${2} @@ -1103,10 +1133,16 @@ function buildjdk() { local debuglevel=${4} local link_opt=${5} local debug_symbols=${6} + local devkit=${7} local top_dir_abs_src_path=$(pwd)/%{top_level_dir_name} local top_dir_abs_build_path=$(pwd)/${outputdir} +%ifarch s390x + # devkit libstdc++.a fails with "error: relocation refers + # to local symbol "" [9], which is defined in a discarded section + libc_link_opt="dynamic"; +%else # This must be set using the global, so that the # static libraries still use a dynamic stdc++lib if [ "x%{link_type}" = "xbundled" ] ; then @@ -1114,6 +1150,7 @@ function buildjdk() { else libc_link_opt="dynamic"; fi +%endif echo "Using output directory: ${outputdir}"; echo "Checking build JDK ${buildjdk} is operational..." @@ -1124,6 +1161,11 @@ function buildjdk() { echo "Using debug_symbols: ${debug_symbols}" echo "Building %{newjavaver}-%{buildver}, pre=%{ea_designator}, opt=%{lts_designator}" +%ifarch %{devkit_arches} + LIBPATH="${devkit}/lib:${devkit}/lib64" + echo "Setting library path to ${LIBPATH}" +%endif + mkdir -p ${outputdir} pushd ${outputdir} @@ -1131,19 +1173,23 @@ function buildjdk() { # rather than ${link_opt} as the system versions # are always used in a system_libs build, even # for the static library build - scl enable devtoolset-%{dtsversion} "bash ${top_dir_abs_src_path}/configure \ + LD_LIBRARY_PATH=${LIBPATH} \ + bash ${top_dir_abs_src_path}/configure \ %ifarch %{zero_arches} --with-jvm-variants=zero \ %endif - --with-cacerts-file=`readlink -f %{_sysconfdir}/pki/java/cacerts` \ +%ifarch %{devkit_arches} + --with-devkit=${devkit} \ +%endif + --with-cacerts-file=$(readlink -f %{_sysconfdir}/pki/java/cacerts) \ --with-version-build=%{buildver} \ - --with-version-pre=\"%{ea_designator}\" \ - --with-version-opt=\"%{lts_designator}\" \ - --with-vendor-version-string=\"%{oj_vendor_version}\" \ - --with-vendor-name=\"%{oj_vendor}\" \ - --with-vendor-url=\"%{oj_vendor_url}\" \ - --with-vendor-bug-url=\"%{oj_vendor_bug_url}\" \ - --with-vendor-vm-bug-url=\"%{oj_vendor_bug_url}\" \ + --with-version-pre="%{ea_designator}" \ + --with-version-opt="%{lts_designator}" \ + --with-vendor-version-string="%{oj_vendor_version}" \ + --with-vendor-name="%{oj_vendor}" \ + --with-vendor-url="%{oj_vendor_url}" \ + --with-vendor-bug-url="%{oj_vendor_bug_url}" \ + --with-vendor-vm-bug-url="%{oj_vendor_bug_url}" \ --with-boot-jdk=${buildjdk} \ --with-debug-level=${debuglevel} \ --with-native-debug-symbols="${debug_symbols}" \ @@ -1157,25 +1203,28 @@ function buildjdk() { --with-lcms=${link_opt} \ --with-harfbuzz=${link_opt} \ --with-stdc++lib=${libc_link_opt} \ - --with-extra-cxxflags=\"$EXTRA_CPP_FLAGS\" \ - --with-extra-cflags=\"$EXTRA_CFLAGS\" \ - --with-extra-ldflags=\"%{ourldflags}\" \ - --with-num-cores=\"$NUM_PROC\" \ - --with-source-date=\"version\" \ + --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \ + --with-extra-cflags="$EXTRA_CFLAGS" \ + --with-extra-ldflags="%{ourldflags}" \ + --with-num-cores="$NUM_PROC" \ + --with-source-date="version" \ --disable-javac-server \ %ifarch %{zgc_arches} --with-jvm-features=zgc \ %endif - --disable-warnings-as-errors" + --disable-warnings-as-errors cat spec.gmk - scl enable devtoolset-%{dtsversion} "make LOG=trace $maketargets || \ - ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name \"hs_err_pid*.log\" | xargs cat && false )" + LD_LIBRARY_PATH=${LIBPATH} \ + make LOG=trace $maketargets || \ + ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name \"hs_err_pid*.log\" | xargs cat && false ) + popd } function stripjdk() { local outputdir=${1} + local toolpath=${2} local jdkimagepath=images/%{jdkimage} local jreimagepath=images/%{jreimage} local jmodimagepath=images/jmods @@ -1185,6 +1234,14 @@ function stripjdk() { local jdkoutdir=${outputdir}/${jdkimagepath} local jreoutdir=${outputdir}/${jreimagepath} +%ifarch %{devkit_arches} + OBJCOPY=${toolpath}/objcopy + STRIP=${toolpath}/strip +%else + OBJCOPY=$(which objcopy) + STRIP=$(which strip) +%endif + if [ "x$suffix" = "x" ] ; then # Keep the unstripped version for consumption by RHEL RPMs cp -a ${jdkoutdir}{,.unstripped} @@ -1193,9 +1250,9 @@ function stripjdk() { for file in $(find ${jdkoutdir} ${jreoutdir} ${supportdir} ${modulebuildpath} -type f) ; do if file ${file} | cut -d ':' -f 2 | grep -q 'ELF'; then noextfile=${file/.so/}; - scl enable devtoolset-%{dtsversion} "objcopy --only-keep-debug ${file} ${noextfile}.debuginfo"; - scl enable devtoolset-%{dtsversion} "objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file}"; - scl enable devtoolset-%{dtsversion} "strip -g ${file}"; + ${OBJCOPY} --only-keep-debug ${file} ${noextfile}.debuginfo; + ${OBJCOPY} --add-gnu-debuglink=${noextfile}.debuginfo ${file}; + ${STRIP} -g ${file}; fi done @@ -1466,11 +1523,31 @@ function packagejdk() { } +%ifarch %{devkit_arches} + DEVKIT_ROOT=$(pwd)/devkit + source ${DEVKIT_ROOT}/devkit.info + GCC="${DEVKIT_TOOLCHAIN_PATH}/gcc --sysroot=${DEVKIT_SYSROOT}" + LIBPATH="${DEVKIT_ROOT}/lib:${DEVKIT_ROOT}/lib64" +%else + GCC=$(which gcc) +%endif + +echo "Building %{SOURCE11}" +mkdir -p %{altjavaoutputdir} +LD_LIBRARY_PATH="${LIBPATH}" ${GCC} ${EXTRA_CFLAGS} -o %{altjavaoutputdir}/%{alt_java_name} %{SOURCE11} +echo "Generating %{alt_java_name} man page" +altjavamanpage=%{altjavaoutputdir}/%{alt_java_name}.1 +echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > ${altjavamanpage} +cat %{top_level_dir_name}/src/java.base/share/man/java.1 >> ${altjavamanpage} + +echo "Building %{newjavaver}-%{buildver}, pre=%{ea_designator}, opt=%{lts_designator}" + %if %{build_hotspot_first} # Build a fresh libjvm.so first and use it to bootstrap + echo "Building HotSpot only for the latest libjvm.so" cp -LR --preserve=mode,timestamps %{bootjdk} newboot systemjdk=$(pwd)/newboot - buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled" "internal" + buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled" "internal" ${DEVKIT_ROOT} mv build/newboot/jdk/lib/%{vm_variant}/libjvm.so newboot/lib/%{vm_variant} %else systemjdk=%{bootjdk} @@ -1513,15 +1590,15 @@ for suffix in %{build_loop} ; do run_bootstrap=%{bootstrap_build} fi if ${run_bootstrap} ; then - buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt} ${debug_symbols} + buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt} ${debug_symbols} ${DEVKIT_ROOT} installjdk ${bootbuilddir} ${bootinstalldir} - buildjdk ${builddir} $(pwd)/${bootinstalldir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols} - stripjdk ${builddir} + buildjdk ${builddir} $(pwd)/${bootinstalldir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols} ${DEVKIT_ROOT} + stripjdk ${builddir} ${DEVKIT_TOOLCHAIN_PATH} installjdk ${builddir} ${installdir} %{!?with_artifacts:rm -rf ${bootinstalldir}} else - buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols} - stripjdk ${builddir} + buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols} ${DEVKIT_ROOT} + stripjdk ${builddir} ${DEVKIT_TOOLCHAIN_PATH} installjdk ${builddir} ${installdir} fi packagejdk ${installdir} ${packagesdir} %{altjavaoutputdir} @@ -1555,6 +1632,22 @@ export JAVA_HOME=${top_dir_abs_main_build_path}/images/%{jdkimage} #sed -i -e "s:^security.useSystemPropertiesFile=.*:security.useSystemPropertiesFile=true:" \ #${JAVA_HOME}/conf/security/java.security +# Set up tools +%ifarch %{devkit_arches} + DEVKIT_ROOT=$(pwd)/devkit + source ${DEVKIT_ROOT}/devkit.info + NM="${DEVKIT_TOOLCHAIN_PATH}/nm" +%else + NM=$(which nm) +%endif +# elfutils readelf supports more binaries than binutils version on RHEL 8 +# and debug symbols tests below were designed around this version +READELF=$(which eu-readelf) +# Only native gdb seems to work +# The devkit gdb needs the devkit stdc++ library but then the JVM +# segfaults when this is on the LD_LIBRARY_PATH +GDB=$(which gdb) + # Check Shenandoah is enabled %if %{use_shenandoah_hotspot} $JAVA_HOME/bin/java -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -version @@ -1616,14 +1709,14 @@ $JAVA_HOME/bin/java -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -versi %endif # Check java launcher has no SSB mitigation -if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi +if ! ${NM} $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi # Check alt-java launcher has SSB mitigation on supported architectures # set_speculation function exists in both cases, so check for prctl call %ifarch %{ssbd_arches} -nm %{altjavaoutputdir}/%{alt_java_name} | grep prctl +${NM} %{altjavaoutputdir}/%{alt_java_name} | grep prctl %else -if ! nm %{altjavaoutputdir}/%{alt_java_name} | grep prctl ; then true ; else false; fi +if ! ${NM} %{altjavaoutputdir}/%{alt_java_name} | grep prctl ; then true ; else false; fi %endif %if %{include_staticlibs} @@ -1631,8 +1724,8 @@ if ! nm %{altjavaoutputdir}/%{alt_java_name} | grep prctl ; then true ; else fal export STATIC_LIBS_HOME=${top_dir_abs_staticlibs_build_path}/images/%{static_libs_image} ls -l $STATIC_LIBS_HOME ls -l $STATIC_LIBS_HOME/lib -readelf --debug-dump $STATIC_LIBS_HOME/lib/libnet.a | grep Inet4AddressImpl.c -readelf --debug-dump $STATIC_LIBS_HOME/lib/libnet.a | grep Inet6AddressImpl.c +${READELF} --debug-dump $STATIC_LIBS_HOME/lib/libnet.a | grep Inet4AddressImpl.c +${READELF} --debug-dump $STATIC_LIBS_HOME/lib/libnet.a | grep Inet6AddressImpl.c %endif # Release builds strip the debug symbols into external .debuginfo files @@ -1651,15 +1744,15 @@ do # Test for .debug_* sections in the shared object. This is the main test # Stripped objects will not contain these - eu-readelf -S "$lib" | grep "] .debug_" - test $(eu-readelf -S "$lib" | grep -E "\]\ .debug_(info|abbrev)" | wc --lines) == 2 + ${READELF} -S "$lib" | grep "] .debug_" + test $(${READELF} -S "$lib" | grep -E "\]\ .debug_(info|abbrev)" | wc --lines) == 2 # Test FILE symbols. These will most likely be removed by anything that # manipulates symbol tables because it's generally useless. So a nice test # that nothing has messed with symbols old_IFS="$IFS" IFS=$'\n' - for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT") + for line in $(${READELF} -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT") do # We expect to see .cpp and .S files, except for architectures like aarch64 and # s390 where we expect .o and .oS files @@ -1669,17 +1762,17 @@ do # If this is the JVM, look for javaCalls.(cpp|o) in FILEs, for extra sanity checking if [ "`basename $lib`" = "libjvm.so" ]; then - eu-readelf -s "$lib" | \ + ${READELF} -s "$lib" | \ grep -E "00000000 0 FILE LOCAL DEFAULT ABS javaCalls.(cpp|o)$" fi # Test that there are no .gnu_debuglink sections pointing to another # debuginfo file. There shouldn't be any debuginfo files, so the link makes # no sense either - eu-readelf -S "$lib" | grep 'gnu' - if eu-readelf -S "$lib" | grep '] .gnu_debuglink' | grep PROGBITS; then + ${READELF} -S "$lib" | grep 'gnu' + if ${READELF} -S "$lib" | grep '] .gnu_debuglink' | grep PROGBITS; then echo "bad .gnu_debuglink section." - eu-readelf -x .gnu_debuglink "$lib" + ${READELF} -x .gnu_debuglink "$lib" false fi fi @@ -1691,7 +1784,7 @@ done # Using line number 1 might cause build problems. See: # https://bugzilla.redhat.com/show_bug.cgi?id=1539664 # https://bugzilla.redhat.com/show_bug.cgi?id=1538767 -gdb -q "$JAVA_HOME/bin/java" < - 1:21.0.5.0.11-2 +- Bump devkit requirement to 1.0-8 to bring in the gcc with --enable-linker-build-id +- Related: OPENJDK-3068 + * Wed Oct 16 2024 Andrew Hughes - 1:21.0.5.0.11-1 - Update to jdk-21.0.5+11 (GA) - Update release notes to 21.0.5+11 @@ -1874,6 +1971,14 @@ done - Update to jdk-21.0.4+7 (GA) - Update release notes to 21.0.4+7 - Switch to GA mode. +- Sync with RHEL 7 portable build: + - Conditionally define __os_install_post, dtsversion & pkgos only on RHEL 7 + - Use ExclusiveArch over ExcludeArch + - Depend on devtoolset only on RHEL 7 + - Use javapackages-filesystem rather than manually defining _jvmdir + - Restrict pandoc dependency to RHEL/CentOS 8 + - Drop unused component macro +- Sync ExclusiveArch with devkit_arches on RHEL only - ** This tarball is embargoed until 2024-07-16 @ 1pm PT. ** - Resolves: OPENJDK-2756 - Resolves: OPENJDK-3163 @@ -1884,10 +1989,10 @@ done - Move unstripped, misc and doc tarball handling into normal build / no suffix blocks - Limit Java only tests to one architecture using jdk_test_arch - Drop unneeded tzdata-java build dependency following 3e3cf8fa2df7bac2f6a60a0ddd596ec39228a3e1 -- Resolves: OPENJDK-3132 -- Resolves: OPENJDK-3194 -- Resolves: OPENJDK-3181 -- Resolves: OPENJDK-3189 +- Resolves: OPENJDK-3133 +- Resolves: OPENJDK-3237 +- Resolves: OPENJDK-3182 +- Resolves: OPENJDK-3190 * Sat Jun 22 2024 Andrew Hughes - 1:21.0.4.0.1-0.1.ea - Update to jdk-21.0.4+1 (EA) @@ -1895,26 +2000,14 @@ done - Switch to EA mode - Bump LCMS 2 version to 2.16.0 following JDK-8321489 - Add zlib build requirement or bundled version (1.3.1), depending on system_libs setting -- Resolves: OPENJDK-3060 -- Resolves: OPENJDK-3063 - -* Tue Jun 11 2024 Andrew Hughes - 1:21.0.3.0.9-3 -- Re-run jlink to regenerate the jmods directory and lib/modules with stripped libraries -- Rebuild CDS archives against the updated lib/modules -- Resolves: OPENJDK-2829 - -* Wed May 01 2024 Thomas Fitzsimmons - 1:21.0.3.0.9-2 -- createtar: Add exclude option -- packagejdk: Exclude debuginfo when creating jdkarchive and jrearchive tarballs -- Resolves: OPENJDK-2995 +- Resolves: OPENJDK-3061 +- Resolves: OPENJDK-3064 * Sat Apr 13 2024 Andrew Hughes - 1:21.0.3.0.9-1 - Update to jdk-21.0.3+9 (GA) - Update release notes to 21.0.3+9 - Switch to GA mode. -- Change --with-source-date value to 'version' to match Temurin builds - ** This tarball is embargoed until 2024-04-16 @ 1pm PT. ** -- Resolves: OPENJDK-2585 * Thu Apr 04 2024 Andrew Hughes - 1:21.0.3.0.7-0.1.ea - Update to jdk-21.0.3+7 (EA) @@ -1924,32 +2017,7 @@ done - Drop JDK-8009550 which is now available upstream - Re-generate FIPS patch against 21.0.3+7 following backport of JDK-8325254 -* Thu Mar 21 2024 Andrew Hughes - 1:21.0.3.0.1-0.2.ea -- generate_source_tarball.sh: Update examples in header for clarity -- generate_source_tarball.sh: Cleanup message issued when checkout already exists -- generate_source_tarball.sh: Create directory in TMPDIR when using WITH_TEMP -- generate_source_tarball.sh: Only add --depth=1 on non-local repositories -- icedtea_sync.sh: Reinstate from rhel-8.9.0 branch -- Move maintenance scripts to a scripts subdirectory -- discover_trees.sh: Set compile-command and indentation instructions for Emacs -- discover_trees.sh: shellcheck: Do not use -o (SC2166) -- discover_trees.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268) -- discover_trees.sh: shellcheck: Double-quote variable references (SC2086) -- generate_source_tarball.sh: Add authorship -- icedtea_sync.sh: Set compile-command and indentation instructions for Emacs -- icedtea_sync.sh: shellcheck: Double-quote variable references (SC2086) -- icedtea_sync.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268) -- openjdk_news.sh: Set compile-command and indentation instructions for Emacs -- openjdk_news.sh: shellcheck: Double-quote variable references (SC2086) -- openjdk_news.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268) -- openjdk_news.sh: shellcheck: Remove deprecated egrep usage (SC2196) -- generate_source_tarball.sh: Output values of new options WITH_TEMP and OPENJDK_LATEST -- generate_source_tarball.sh: Double-quote DEPTH reference (SC2086) -- Vary reproducible tar creation by version of tar detected -- Set OPENJDK_UPSTREAM_TAG_EPOCH & VERSION_FILE at start of build section as in 17u -- generate_source_tarball.sh: Avoid empty DEPTH reference while still appeasing shellcheck - -* Wed Mar 20 2024 Thomas Fitzsimmons - 1:21.0.3.0.1-0.2.ea +* Wed Mar 20 2024 Thomas Fitzsimmons - 1:21.0.3.0.1-0.1.ea - generate_source_tarball.sh: Add WITH_TEMP environment variable - generate_source_tarball.sh: Multithread xz on all available cores - generate_source_tarball.sh: Add OPENJDK_LATEST environment variable @@ -1978,54 +2046,78 @@ done - generate_source_tarball.sh: Add license - generate_source_tarball.sh: Add indentation instructions for Emacs - Remove -T0 argument from systemtap tar invocation - -* Mon Mar 11 2024 Andrew Hughes - 1:21.0.3.0.1-0.2.ea -- Introduce tar_opts to avoid repetition of lengthy tar creation options -- Add module build path to stripped directories to catch jpackageapplauncher files -- Move alt-java man page to the misc tarball so it is not in the JDK image -- Resolves: OPENJDK-2820 -- Resolves: OPENJDK-2821 - -* Thu Feb 08 2024 Thomas Fitzsimmons - 1:21.0.3.0.1-0.2.ea -- Invoke xz in multi-threaded mode -- Remove ppc64le with-jobs=1 workaround -- Make portable tarball modification times reproducible - Use RHEL-7 tar-1.26-compatible invocations for reproducible tarballs +- createtar: Add exclude option +- packagejdk: Exclude debuginfo when creating jdkarchive and jrearchive tarballs +- Resolves: OPENJDK-2995 -* Fri Feb 02 2024 Andrew Hughes - 1:21.0.3.0.1-0.1.ea +* Mon Mar 18 2024 Andrew Hughes - 1:21.0.3.0.1-0.1.ea - Update to jdk-21.0.3+1 (EA) - Update release notes to 21.0.3+1 - Switch to EA mode - Require tzdata 2023d due to upstream inclusion of JDK-8322725 - Bump FreeType version to 2.13.2 following JDK-8316028 +- Add module build path to stripped directories to catch jpackageapplauncher files +- Move alt-java man page to the misc tarball so it is not in the JDK image +- generate_source_tarball.sh: Update examples in header for clarity +- generate_source_tarball.sh: Cleanup message issued when checkout already exists +- generate_source_tarball.sh: Create directory in TMPDIR when using WITH_TEMP +- generate_source_tarball.sh: Only add --depth=1 on non-local repositories +- icedtea_sync.sh: Reinstate from rhel-8.9.0 branch +- Move maintenance scripts to a scripts subdirectory +- discover_trees.sh: Set compile-command and indentation instructions for Emacs +- discover_trees.sh: shellcheck: Do not use -o (SC2166) +- discover_trees.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268) +- discover_trees.sh: shellcheck: Double-quote variable references (SC2086) +- generate_source_tarball.sh: Add authorship +- icedtea_sync.sh: Set compile-command and indentation instructions for Emacs +- icedtea_sync.sh: shellcheck: Double-quote variable references (SC2086) +- icedtea_sync.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268) +- openjdk_news.sh: Set compile-command and indentation instructions for Emacs +- openjdk_news.sh: shellcheck: Double-quote variable references (SC2086) +- openjdk_news.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268) +- openjdk_news.sh: shellcheck: Remove deprecated egrep usage (SC2196) +- generate_source_tarball.sh: Output values of new options WITH_TEMP and OPENJDK_LATEST +- generate_source_tarball.sh: Double-quote DEPTH reference (SC2086) +- generate_source_tarball.sh: Avoid empty DEPTH reference while still appeasing shellcheck +- Vary reproducible tar creation by version of tar detected +- Set OPENJDK_UPSTREAM_TAG_EPOCH & VERSION_FILE at start of build section as in 17u +- Change --with-source-date value to 'version' to match Temurin builds +- Re-run jlink to regenerate the jmods directory and lib/modules with stripped libraries +- Rebuild CDS archives against the updated lib/modules +- Require openjdk-devkit 1.0-4 to bring in fixes for .comment section and deterministic archives +- Bump devkit requirement to 1.0-5 to bring in the bootstrapped version +- Set LD_LIBRARY_PATH when calling gcc to build alt-java +- Set LD_LIBRARY_PATH when calling configure +- Set LD_LIBRARY_PATH when calling make +- Bump devkit requirement to 1.0-6 to bring in the AS=/as fix +- Resolves: OPENJDK-2820 +- Resolves: OPENJDK-2821 +- Resolves: OPENJDK-2585 +- Resolves: OPENJDK-3138 -* Sat Jan 27 2024 Andrew Hughes - 1:21.0.2.0.13-2 -- Sync with upstream release notes - -* Tue Jan 09 2024 Andrew Hughes - 1:21.0.2.0.13-1 +* Fri Mar 15 2024 Andrew Hughes - 1:21.0.2.0.13-1 - Update to jdk-21.0.2+13 (GA) - Update release notes to 21.0.2+13 -- Drop no longer needed local patch to fix versioning -- ** This tarball is embargoed until 2024-01-16 @ 1pm PT. ** - -* Mon Jan 08 2024 Andrew Hughes - 1:21.0.2.0.12-1 -- Update to jdk-21.0.2+12 (GA) -- Update release notes to 21.0.2+12 -- ** This tarball is embargoed until 2024-01-16 @ 1pm PT. ** - -* Sat Jan 06 2024 Andrew Hughes - 1:21.0.2.0.11-1 -- Update to jdk-21.0.2+11 (GA) -- Update release notes to 21.0.2+11 - Bump libpng version to 1.6.40 following JDK-8316030 - Bump HarfBuzz version to 8.2.2 following JDK-8313643 -- Drop local JDK-8311630 patch which is now upstream -- Locally patch versioning to be 21.0.2 released on 2014-01-16 -- ** This tarball is embargoed until 2024-01-16 @ 1pm PT. ** -* Mon Nov 06 2023 Andrew Hughes - 1:21.0.1.0.12-2 -- Include JDK-8311630 patch to implement Foreign Function & Memory preview API on s390x +* Mon Mar 11 2024 Andrew Hughes - 1:21.0.1.0.12-2 +- Use a devkit to build on architectures where we have one (s390x, aarch64, ppc64le, x86_64) +- Use a dynamic libstdc++ on s390x to workaround failure with static libstdc++ +- Use the devkit tools during the check stage so they can understand the generated binaries +- Use eu-readelf on devkit and non-devkit builds as debug symbol tests rely on its behaviour +- Use system gdb for both builds as devkit version fails (needs devkit libraries, then JDK segfaults with them) +- Filter out annobin plugin when using the devkit +- Drop static libstdc++ build dependency on devkit builds as it should come from the devkit +- Introduce tar_opts to avoid repetition of lengthy tar creation options -* Sun Oct 29 2023 Andrew Hughes - 1:21.0.1.0.12-1 +* Thu Feb 08 2024 Thomas Fitzsimmons - 1:21.0.1.0.12-2 +- Invoke xz in multi-threaded mode +- Remove ppc64le with-jobs=1 workaround +- Make portable tarball modification times reproducible + +* Fri Oct 27 2023 Andrew Hughes - 1:21.0.1.0.12-1 - Update to jdk-21.0.1.0+12 (GA) - Update release notes to 21.0.1.0+12 - Update openjdk_news script to specify subdirectory last @@ -2035,17 +2127,32 @@ done - Update bug URL for RHEL to point to the Red Hat customer portal - Fix upstream release URL for OpenJDK source - Update buildjdkver to match the featurever + +* Fri Oct 27 2023 Andrew Hughes - 1:21.0.0.0.35-4 +- Rebuild jmods using the stripped binaries in release builds +- Make sure the unstripped JDK is customised by the installjdk function +- Resolves: OPENJDK-1974 + +* Thu Oct 26 2023 Andrew Hughes - 1:21.0.0.0.35-3 - Re-enable SystemTap support and perform only substitutions possible without final NVR available +- Depend on graphviz & pandoc for full documentation support - Fix typo which stops the EA designator being included in the build - Include tapsets in the miscellaneous tarball - Drop unused globals for tapset installation -- Rebuild jmods using the stripped binaries in release builds -- Make sure the unstripped JDK is customised by the installjdk function -* Sat Oct 28 2023 Andrew Hughes - 1:21.0.0.0.35-1 +* Thu Aug 24 2023 Andrew Hughes - 1:21.0.0.0.35-2 +- Update documentation (README.md, add missing JEP to release notes) +- Replace alt-java patch with a binary separate from the JDK +- Drop stale patches that are of little use any more: +- * nss.cfg has been disabled since early PKCS11 work and long superseded by FIPS work +- * No accessibility subpackage to warrant RH1648242 patch any more +- * No use of system libjpeg turbo to warrant RH649512 patch any more +- Replace RH1684077 pcsc-lite-libs patch with better JDK-8009550 fix being upstreamed +- Related: rhbz#2192749 + +* Mon Aug 21 2023 Andrew Hughes - 1:21.0.0.0.35-1 - Update to jdk-21.0.0+35 - Update release notes to 21.0.0+35 -- Update documentation (README.md) - Update system crypto policy & FIPS patch from new fips-21u tree - Update generate_tarball.sh to sync with upstream vanilla script inc. no more ECC removal - Drop fakefeaturever now it is no longer needed @@ -2053,20 +2160,13 @@ done - Change top_level_dir_name to use the VCS tag, matching new upstream release style tarball - Use upstream release URL for OpenJDK source - Re-enable tzdata tests now we are on the latest JDK and things are back in sync -- Fix trailing '.' in tarball name -- Use rpmrelease in vendor version to avoid inclusion of dist tag -- Replace alt-java patch with a binary separate from the JDK -- Drop stale patches that are of little use any more: -- * nss.cfg has been disabled since early PKCS11 work and long superseded by FIPS work -- * No accessibility subpackage to warrant RH1648242 patch any more -- * No use of system libjpeg turbo to warrant RH649512 patch any more -- Replace RH1684077 pcsc-lite-libs patch with better JDK-8009550 fix being upstreamed +- Related: rhbz#2192749 -* Sat Oct 28 2023 Petra Alice Mikova - 1:21.0.0.0.35-1 +* Mon Aug 21 2023 Petra Alice Mikova - 1:21.0.0.0.35-1 - Replace smoke test files used in the staticlibs test, as fdlibm was removed by JDK-8303798 - Related: rhbz#2192749 -* Fri Oct 27 2023 Andrew Hughes - 1:20.0.2.0.9-1.1 +* Wed Aug 16 2023 Andrew Hughes - 1:20.0.0.0.36-1 - Update to jdk-20.0.2+9 - Update release notes to 20.0.2+9 - Update system crypto policy & FIPS patch from new fips-20u tree @@ -2074,12 +2174,12 @@ done - Update CLDR reference data following update to 42 (Rocky Mountain-Normalzeit => Rocky-Mountain-Normalzeit) - Related: rhbz#2192749 -* Fri Oct 27 2023 Jiri Vanek - 1:20.0.0.0.36-1 +* Wed Aug 16 2023 Jiri Vanek - 1:20.0.0.0.36-1 - Dropped JDK-8295447, JDK-8296239 & JDK-8299439 patches now upstream - Adapted rh1750419-redhat_alt_java.patch - Related: rhbz#2192749 -* Fri Oct 27 2023 Andrew Hughes - 1:19.0.1.0.10-1 +* Tue Aug 15 2023 Andrew Hughes - 1:19.0.1.0.10-1 - Update to jdk-19.0.2 release - Update release notes to 19.0.2 - Rebase FIPS patches from fips-19u branch @@ -2088,7 +2188,7 @@ done - Add local patches for JDK-8296239 & JDK-8299439 (Croatia Euro update) which are present in 8u, 11u & 17u releases - Related: rhbz#2192749 -* Tue Oct 24 2023 Andrew Hughes - 1:18.0.2.0.9-1 +* Thu Aug 10 2023 Andrew Hughes - 1:18.0.2.0.9-1 - Update to jdk-18.0.2 release - Update release notes to actually reflect OpenJDK 18 - Support JVM variant zero following JDK-8273494 no longer installing Zero's libjvm.so in the server directory @@ -2098,25 +2198,18 @@ done - Drop tzdata patches added for 17.0.7 which will eventually appear in the upstream tarball when we reach OpenJDK 21 - Switch bootjdkver to java-21-openjdk - Disable tzdata tests until we are on the latest JDK and things are back in sync -- Drop bootstrap JDKs and use the java-21-openjdk-rhel7 build - Related: rhbz#2192749 -* Tue Oct 24 2023 Petra Alice Mikova - 1:18.0.0.0.37-1 +* Thu Aug 10 2023 Petra Alice Mikova - 1:18.0.0.0.37-1 - Update to ea version of jdk18 - Adjust rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch - -* Tue Aug 22 2023 Andrew Hughes - 1:17.0.7.0.7-2 -- Define architectures we build on to avoid those without DTS 10 (e.g. s390) - -* Tue Aug 22 2023 Andrew Hughes - 1:17.0.7.0.7-2 -- Switch to DTS 10 - Related: rhbz#2192749 * Mon May 15 2023 Andrew Hughes - 1:17.0.7.0.7-2 - Create java-21-openjdk-portable package based on java-17-openjdk-portable - Related: rhbz#2192749 -* Thu Apr 13 2023 Andrew Hughes - 1:17.0.7.0.7-1 +* Tue Apr 25 2023 Andrew Hughes - 1:17.0.7.0.7-2 - Update to jdk-17.0.7.0+7 - Update release notes to 17.0.7.0+7 - Require tzdata 2023c due to local inclusion of JDK-8274864 & JDK-8305113 @@ -2129,12 +2222,20 @@ done - * test/jdk/sun/security/pkcs11/fips/VerifyMissingAttributes.java: fixed jtreg main class - * RH1940064: Enable XML Signature provider in FIPS mode - * RH2173781: Avoid calling C_GetInfo() too early, before cryptoki is initialized +- Fix trailing '.' in tarball name +- Use rpmrelease in vendor version to avoid inclusion of dist tag - ** This tarball is embargoed until 2023-04-18 @ 1pm PT. ** - Resolves: rhbz#2185182 - Resolves: rhbz#2134669 - Resolves: rhbz#1940064 - Resolves: rhbz#2173781 +* Thu Apr 20 2023 Andrew Hughes - 1:17.0.6.0.10-7 +- Sync with existing RHEL 8 build, in order to start building portables on RHEL 8 +- Restore system bootstrap JDK (RHEL 8 has java-17-openjdk) +- Remove use of devtoolset (RHEL 8 native compilers should be sufficient) +- Explicitly exclude x86, as on RHEL RPMs + * Tue Feb 21 2023 Andrew Hughes - 1:17.0.6.0.10-6 - Add docs, icons and samples to the portable output - Make sure generated checksums work and don't include full path diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index 10098ab..23d50ef 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -833,6 +833,8 @@ exit 0 %doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/NEWS %doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/README.md %doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/java-%{featurever}-openjdk-portable.specfile +%doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/openjdk-devkit.specfile +%doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/0*.patch %dir %{_sysconfdir}/.java/.systemPrefs %dir %{_sysconfdir}/.java %dir %{_jvmdir}/%{sdkdir -- %{?1}} @@ -1360,6 +1362,21 @@ Source18: TestTranslations.java Source19: README.md Source20: java-%{featurever}-openjdk-portable.specfile Source21: NEWS +Source22: openjdk-devkit.specfile +# Devkit patches; see https://github.com/rh-openjdk/jdk/tree/devkit +# To regenerate, use git format-patch -N jdk21u/master +# Add RHEL RPM URLs and turn off robots +Source23: 0001-Allow-devkit-to-work-with-RHEL.patch +# Turn off multilib on x86_64 +Source24: 0002-Disable-multilib-on-x86_64.patch +# Improve build logging (OPENJDK-3071) +Source25: 0003-Log-devkit-build-to-stdout.patch +# Remove .comment sections from sysroot objects +Source26: 0004-devkit-Remove-.comment-sections-from-sysroot-objects.patch +# Configure binutils with --enable-deterministic-archives +Source27: 0005-Tools.gmk-Configure-binutils-with-enable-determinist.patch +# Configure gcc with --enable-linker-build-id +Source28: 0006-Tools.gmk-Add-enable-linker-build-id-to-gcc-build.patch # Setup variables to reference correct sources %global releasezip %{_jvmdir}/%{name}-%{version}-%{prelease}.portable.unstripped.jdk.%{_arch}.tar.xz @@ -2190,7 +2207,10 @@ miscdir=$(pwd)/%{installoutputdir -- "-misc"} commondocdir=${RPM_BUILD_ROOT}%{_defaultdocdir}/%{uniquejavadocdir -- $suffix} install -d -m 755 ${commondocdir} mv ${jdk_image}/NEWS ${commondocdir} -cp -a %{SOURCE19} %{SOURCE20} ${commondocdir} +# Copy portable and devkit specfiles and README.md +cp -a %{SOURCE19} %{SOURCE20} %{SOURCE22} ${commondocdir} +# Copy devkit patches +cp -a %{SOURCE23} %{SOURCE24} %{SOURCE25} %{SOURCE26} %{SOURCE27} %{SOURCE28} ${commondocdir} # Install the jdk mkdir -p $RPM_BUILD_ROOT%{_jvmdir} @@ -2538,6 +2558,9 @@ cjc.mainProgram(args) * Fri Jan 17 2025 Andrew Hughes - 1:21.0.5.0.11-3 - Transition to the devkit build by not defining pkgos - Exempt x86_64 from the static libs debuginfo test until portable uses an older DWARF version +- Sync the copy of the portable specfile with the devkit version +- Include the devkit specfile and patches +- Document the devkit in README.md - Resolves: RHEL-74403 * Wed Oct 16 2024 Andrew Hughes - 1:21.0.5.0.11-2 diff --git a/openjdk-devkit.specfile b/openjdk-devkit.specfile new file mode 100644 index 0000000..525243a --- /dev/null +++ b/openjdk-devkit.specfile @@ -0,0 +1,214 @@ +# Spec file for building a devkit for OpenJDK builds + +# We do not want debug packages +%global debug_package %{nil} +# Arch definitions from java-*-openjdk RPM +%global aarch64 aarch64 arm64 armv8 +# x86 is not supported by OpenJDK 17 +ExcludeArch: %{ix86} + +# New Version-String scheme-style defines +%global featurever 21 +%global interimver 0 +%global updatever 5 +%global patchver 0 +%global buildver 11 +# Define JDK versions +%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver} +%global javaver %{featurever} +# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames +%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn}) +# The tag used to create the OpenJDK tarball +%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}} + +# Define milestone (EA for pre-releases, GA for releases) +# Release will be (where N is usually a number starting at 1): +# - 0.N%%{?extraver}%%{?dist} for EA releases, +# - N%%{?extraver}{?dist} for GA releases +%global is_ga 1 +%if %{is_ga} +%global build_type GA +%global ea_designator "" +%global ea_designator_zip %{nil} +%global extraver %{nil} +%global eaprefix %{nil} +%else +%global build_type EA +%global ea_designator ea +%global ea_designator_zip -%{ea_designator} +%global extraver .%{ea_designator} +%global eaprefix 0. +%endif + +Name: openjdk-devkit +Version: 1.0 +Release: 8%{?dist} +License: GPLv2 +URL: http://openjdk.java.net/ +Summary: OpenJDK Devkit + +# The source tarball, generated using generate_source_tarball.sh +Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}%{ea_designator_zip}.tar.xz +# The buildroot RPMs for each architecture +Source1: devkit-rpms-aarch64.tar.xz +Source2: devkit-rpms-ppc64le.tar.xz +Source3: devkit-rpms-s390x.tar.xz +Source4: devkit-rpms-x86_64.tar.xz +# Toolchain sources +Source5: binutils-2.39.tar.gz +Source6: gcc-11.3.0.tar.xz +Source7: gmp-6.2.1.tar.bz2 +Source8: mpc-1.2.1.tar.gz +Source9: mpfr-4.1.1.tar.bz2 +Source10: gdb-11.2.tar.xz + +# Devkit patches; see https://github.com/rh-openjdk/jdk/tree/devkit +# To regenerate, use git format-patch -N jdk21u/master +# Add RHEL RPM URLs and turn off robots +Patch0: 0001-Allow-devkit-to-work-with-RHEL.patch +# Turn off multilib on x86_64 +Patch1: 0002-Disable-multilib-on-x86_64.patch +# Improve build logging (OPENJDK-3071) +Patch2: 0003-Log-devkit-build-to-stdout.patch +# Remove .comment sections from sysroot objects +Patch3: 0004-devkit-Remove-.comment-sections-from-sysroot-objects.patch +# Configure binutils with --enable-deterministic-archives +Patch4: 0005-Tools.gmk-Configure-binutils-with-enable-determinist.patch +# Configure gcc with --enable-linker-build-id +Patch5: 0006-Tools.gmk-Add-enable-linker-build-id-to-gcc-build.patch + +BuildRequires: make autoconf automake libtool gcc gcc-c++ wget glibc-devel texinfo tar bison + +# Setup variables to reference correct sources +%ifarch %{aarch64} +%global rpmtarball %{SOURCE1} +%endif +%ifarch ppc64le +%global rpmtarball %{SOURCE2} +%endif +%ifarch s390x +%global rpmtarball %{SOURCE3} +%endif +%ifarch x86_64 +%global rpmtarball %{SOURCE4} +%endif + +%description +OpenJDK Devkit + +%prep + +# Unpack OpenJDK sources only in build directory +%setup -q -T -c -a 0 + +# This syntax is deprecated: +# %patchN [...] +# and should be replaced with: +# %patch -PN [...] +# For example: +# %patch1001 -p1 +# becomes: +# %patch -P1001 -p1 +# The replacement format suggested by recent (circa Fedora 38) RPM +# deprecation messages: +# %patch N [...] +# is not backward-compatible with prior (circa RHEL-8) versions of +# rpmbuild. +pushd jdk-* +%patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 +%patch -P4 -p1 +%patch -P5 -p1 +popd + +mkdir -p devkit/download +pushd devkit/download +tar -xJf %{rpmtarball} +ln -s %{SOURCE5} +ln -s %{SOURCE6} +ln -s %{SOURCE7} +ln -s %{SOURCE8} +ln -s %{SOURCE9} +ln -s %{SOURCE10} + +%build + +devkit_dir=$(pwd)/devkit +today=$(date +%Y%m%d) +arch=%{_target_cpu} +result_name=${arch}-linux-gnu-to-${arch}-linux-gnu +result_path=result/${result_name} + +pushd jdk-*/make/devkit + +# Build devkit first using the native toolchain, +# than again using itself +for variant in bootstrap product ; do + if [ -e ${devkit_dir}-bootstrap/${result_path}/bin/gcc ] ; then + ROOTDIR=${devkit_dir}-bootstrap/${result_path}; + BINDIR=${ROOTDIR}/bin; + TOOLS="CC=${BINDIR}/gcc CXX=${BINDIR}/g++ LD=${BINDIR}/ld \ + AR=${BINDIR}/ar AS=${BINDIR}/as RANLIB=${BINDIR}/ranlib \ + OBJDUMP=${BINDIR}/objdump" + LIBPATH="${ROOTDIR}/lib64:${ROOTDIR}/lib" + else + TOOLS="CC=$(which gcc) CXX=$(which g++) LD=$(which ld) \ + AR=$(which ar) AS=$(which as) RANLIB=$(which ranlib) \ + OBJDUMP=$(which objdump)" + fi + mkdir -p ${devkit_dir}-${variant} + ln -s ${devkit_dir}/download ${devkit_dir}-${variant} + LD_LIBRARY_PATH="${LIBPATH}" \ + make -f Tools.gmk all ${TOOLS} \ + HOST=${arch}-linux-gnu \ + BUILD=${arch}-linux-gnu \ + RESULT=${devkit_dir}-${variant}/result \ + OUTPUT_ROOT=${devkit_dir}-${variant} \ + TARGET=${arch}-linux-gnu \ + PREFIX=${devkit_dir}-${variant}/${result_path} \ + BASE_OS=RHEL +done + +make -r -f Tars.gmk \ + SRC_DIR=${devkit_dir}-product/${result_path} \ + TAR_FILE=${devkit_dir}-product/result/sdk-${result_name}-${today}.tar.gz +popd + +%install +mkdir -p %{buildroot}%{_datadir}/%{name} +cp -p devkit-product/result/*.tar.gz %{buildroot}%{_datadir}/%{name}/ + +%files +%{_datadir}/%{name} + +%changelog +* Wed Nov 27 2024 Andrew Hughes - 1.0-8 +- Add --enable-linker-build-id to gcc build +- Resolves: OPENJDK-3068 + +* Wed Oct 30 2024 Andrew Hughes - 1.0-7 +- Improve build logging by also writing to stdout +- Cleanup patches and rebase on jdk-21.0.5-ga +- Drop JDK-8323671 patch which is upstream as of 21.0.3+3 +- Resolves: OPENJDK-3071 + +* Tue Jun 11 2024 Andrew Hughes - 1.0-6 +- Fix typo where 'as' binary is accidentally capitalised in AS=/as + +* Wed May 01 2024 Andrew Hughes - 1.0-5 +- Bootstrap the devkit, building it again with itself + +* Mon Apr 08 2024 Andrew Hughes - 1.0-4 +- Include Thomas' patches to drop .comment sections and build binutils with deterministic archives +- Use backward-compatible patch syntax + +* Tue Feb 06 2024 Andrew Hughes - 1.0-3 +- Include JDK-8323671 patch so the binaries don't contain the full source path + +* Fri Dec 08 2023 Andrew Hughes - 1.0-2 +- Try to turn off multlib on x86_64 as we don't have the dependencies for it + +* Tue Dec 05 2023 Andrew Hughes - 1.0-1 +- Create RHEL 7 based devkit for building OpenJDK