rpms/java-21-openjdk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix make 4.3 build issues

Browse Source 
JDK-8237879 causes build issues because of changes in make
This commit is contained in:
Petra Mikova 2020-03-13 07:26:59 +01:00
parent 0f4f0ca435
commit a12c2576b2
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java-latest-openjdk.spec
View File

@ -219,7 +219,7 @@
%global top_level_dir_name %{origin} %global top_level_dir_name %{origin}
%global minorver 0 %global minorver 0
%global buildver 8 %global buildver 8
%global rpmrelease 3 %global rpmrelease 4
# 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 # 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 %if %is_system_jdk
%global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} ) %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
@ -1050,6 +1050,8 @@ Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-d
# JDK-8224851: AArch64: fix warnings and errors with Clang and GCC 8.3 # JDK-8224851: AArch64: fix warnings and errors with Clang and GCC 8.3
Patch7: jdk8224851-aarch64_compiler_fixes.patch Patch7: jdk8224851-aarch64_compiler_fixes.patch
# JDK-8237879: make 4.3 breaks build
Patch8: jdk8237879-make_4_3_build_fixes.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -1277,6 +1279,7 @@ pushd %{top_level_dir_name}
%patch4 -p1 %patch4 -p1
%patch6 -p1 %patch6 -p1
%patch7 -p1 %patch7 -p1
%patch8 -p1
popd # openjdk popd # openjdk
%patch1000 %patch1000
@ -1825,6 +1828,9 @@ require "copy_jdk_configs.lua"
%changelog %changelog
* Thu Mar 12 2020 Petra Alice Mikova <pmikova@redhat.com> - 1:13.0.2.8-4.rolling
- add patch for build issues with make 4.3
* Thu Feb 27 2020 Severin Gehwolf <sgehwolf@redhat.com> - 1:13.0.2.8-3.rolling * Thu Feb 27 2020 Severin Gehwolf <sgehwolf@redhat.com> - 1:13.0.2.8-3.rolling
- add workaround for issues with build with GCC10 on s390x (see RHBZ#1799531) - add workaround for issues with build with GCC10 on s390x (see RHBZ#1799531)
- fix issues with build with GCC10: JDK-8224851, -fcommon switch - fix issues with build with GCC10: JDK-8224851, -fcommon switch

34
jdk8237879-make_4_3_build_fixes.patch Normal file
View File

@ -0,0 +1,34 @@
# HG changeset patch
# User ihse
# Date 1580378910 -3600
# Node ID 0743e1d49930a95d045bfdaa8f8607a00289e677
# Parent 24b4c763cb2276db073bec263246879eb312daeb
8237879: make 4.3 breaks build
Reviewed-by: erikj, tbell
diff -r 24b4c763cb22 -r 0743e1d49930 make/common/MakeBase.gmk
--- a/make/common/MakeBase.gmk Thu Jan 30 10:10:48 2020 +0100
+++ b/make/common/MakeBase.gmk Thu Jan 30 11:08:30 2020 +0100
@@ -525,15 +525,16 @@
# Param 2 - (optional) name of file to store value in
DependOnVariableHelper = \
$(strip \
- $(eval -include $(call DependOnVariableFileName, $1, $2)) \
+ $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \
+ $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \
$(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
- $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
+ $(call MakeDir, $(dir $($1_filename))) \
$(if $(findstring $(LOG_LEVEL), trace), \
$(info NewVariable $1: >$(strip $($1))<) \
$(info OldVariable $1: >$(strip $($1_old))<)) \
$(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
- $(call DependOnVariableFileName, $1, $2))) \
- $(call DependOnVariableFileName, $1, $2) \
+ $($1_filename))) \
+ $($1_filename) \
)
# Main macro