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
9d47beb6f3
commit
e0187b47d0
@ -1062,6 +1062,13 @@ Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-d
|
||||
# JDK-8237879: make 4.3 breaks build
|
||||
Patch7: jdk8237879-make_4_3_build_fixes.patch
|
||||
|
||||
#############################################
|
||||
#
|
||||
# OpenJDK upstreamable patches
|
||||
#
|
||||
#############################################
|
||||
Patch8: jdk8243059-build_fails_when_with_vendor_contains_comma.patch
|
||||
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: alsa-lib-devel
|
||||
@ -1288,6 +1295,7 @@ pushd %{top_level_dir_name}
|
||||
%patch4 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
popd # openjdk
|
||||
|
||||
%patch1000
|
||||
@ -1390,7 +1398,7 @@ bash ../configure \
|
||||
--with-version-pre="%{ea_designator}"\
|
||||
--with-version-opt=%{lts_designator} \
|
||||
--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-bug-url="%{bugs}" \
|
||||
--with-vendor-vm-bug-url="%{bugs}" \
|
||||
|
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