Fxing build failure caused by "," in value of vendor property
Removing the comma is fixing the build, trying with $(COMMA)
This commit is contained in:
parent
36e25b7e87
commit
1f330e68ab
@ -204,7 +204,7 @@
|
|||||||
# buildjdkver is usually same as %%{majorver},
|
# buildjdkver is usually same as %%{majorver},
|
||||||
# but in time of bootstrap of next jdk, it is majorver-1,
|
# but in time of bootstrap of next jdk, it is majorver-1,
|
||||||
# and this it is better to change it here, on single place
|
# and this it is better to change it here, on single place
|
||||||
%global buildjdkver 13
|
%global buildjdkver 14
|
||||||
# Used via new version scheme. JDK 13 was
|
# Used via new version scheme. JDK 13 was
|
||||||
# GA'ed in September 2019 => 19.9
|
# GA'ed in September 2019 => 19.9
|
||||||
%global vendor_version_string 19.9
|
%global vendor_version_string 19.9
|
||||||
@ -1052,6 +1052,14 @@ Patch4: pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch
|
|||||||
# Depend on pcs-lite-libs instead of pcs-lite-devel as this is only in optional repo
|
# Depend on pcs-lite-libs instead of pcs-lite-devel as this is only in optional repo
|
||||||
Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
|
Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
|
||||||
|
|
||||||
|
|
||||||
|
#############################################
|
||||||
|
#
|
||||||
|
# OpenJDK upstreamable patches
|
||||||
|
#
|
||||||
|
#############################################
|
||||||
|
Patch8: jdk8243059-build_fails_when_with_vendor_contains_comma.patch
|
||||||
|
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: alsa-lib-devel
|
BuildRequires: alsa-lib-devel
|
||||||
@ -1277,6 +1285,7 @@ pushd %{top_level_dir_name}
|
|||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
|
%patch8 -p1
|
||||||
popd # openjdk
|
popd # openjdk
|
||||||
|
|
||||||
%patch1000
|
%patch1000
|
||||||
@ -1379,7 +1388,7 @@ bash ../configure \
|
|||||||
--with-version-pre="%{ea_designator}"\
|
--with-version-pre="%{ea_designator}"\
|
||||||
--with-version-opt=%{lts_designator} \
|
--with-version-opt=%{lts_designator} \
|
||||||
--with-vendor-version-string="%{vendor_version_string}" \
|
--with-vendor-version-string="%{vendor_version_string}" \
|
||||||
--with-vendor-name="Red Hat, Inc" \
|
--with-vendor-name="Red Hat, Inc." \
|
||||||
--with-vendor-url="https://www.redhat.com/" \
|
--with-vendor-url="https://www.redhat.com/" \
|
||||||
--with-vendor-bug-url="%{bugs}" \
|
--with-vendor-bug-url="%{bugs}" \
|
||||||
--with-vendor-vm-bug-url="%{bugs}" \
|
--with-vendor-vm-bug-url="%{bugs}" \
|
||||||
@ -1822,6 +1831,7 @@ require "copy_jdk_configs.lua"
|
|||||||
- made urls to be preconfigured by os
|
- made urls to be preconfigured by os
|
||||||
|
|
||||||
* Tue Mar 24 2020 Petra Alice Mikova <pmikova@redhat.com> - 1:14.0.0.36-3.rolling
|
* Tue Mar 24 2020 Petra Alice Mikova <pmikova@redhat.com> - 1:14.0.0.36-3.rolling
|
||||||
|
- bump buildjdkver to 14
|
||||||
- uploaded new src tarball
|
- uploaded new src tarball
|
||||||
|
|
||||||
* Mon Mar 23 2020 Petra Alice Mikova <pmikova@redhat.com> - 1:14.0.0.36-2.rolling
|
* Mon Mar 23 2020 Petra Alice Mikova <pmikova@redhat.com> - 1:14.0.0.36-2.rolling
|
||||||
|
12
jdk8243059-build_fails_when_with_vendor_contains_comma.patch
Normal file
12
jdk8243059-build_fails_when_with_vendor_contains_comma.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff --git a/make/launcher/LauncherCommon.gmk b/make/launcher/LauncherCommon.gmk
|
||||||
|
--- a/make/launcher/LauncherCommon.gmk
|
||||||
|
+++ b/make/launcher/LauncherCommon.gmk
|
||||||
|
@@ -139,7 +139,7 @@
|
||||||
|
OPTIMIZATION := $$($1_OPTIMIZATION), \
|
||||||
|
CFLAGS := $$(CFLAGS_JDKEXE) \
|
||||||
|
$(LAUNCHER_CFLAGS) \
|
||||||
|
- $(VERSION_CFLAGS) \
|
||||||
|
+ $(subst $(COMMA),$(DOLLAR)(COMMA),$(VERSION_CFLAGS)) \
|
||||||
|
-DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \
|
||||||
|
-DPROGNAME='"$1"' \
|
||||||
|
$$($1_CFLAGS), \
|
Loading…
Reference in New Issue
Block a user