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
c819146128
commit
0313620e0e
@ -1059,6 +1059,12 @@ Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-d
|
|||||||
#
|
#
|
||||||
#############################################
|
#############################################
|
||||||
|
|
||||||
|
#############################################
|
||||||
|
#
|
||||||
|
# OpenJDK upstreamable patches
|
||||||
|
#
|
||||||
|
#############################################
|
||||||
|
Patch8: jdk8243059-build_fails_when_with_vendor_contains_comma.patch
|
||||||
|
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
@ -1285,6 +1291,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
|
||||||
@ -1387,7 +1394,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}" \
|
||||||
|
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