[java-1.8.0-openjdk] Add patch to handle -j and -I correctly
Omair Majid
omajid at fedoraproject.org
Thu Jun 12 17:32:22 UTC 2014
commit 87ae8e7a61762f57fcccb196fa8cb85758e0c97e
Author: Omair Majid <omajid at redhat.com>
Date: Thu Jun 12 11:53:16 2014 -0400
Add patch to handle -j and -I correctly
This is a fix for build-breakage seen with make 4.0
hotspot-build-j-directive.patch | 19 +++++++++++++++++++
java-1.8.0-openjdk.spec | 6 ++++++
2 files changed, 25 insertions(+), 0 deletions(-)
---
diff --git a/hotspot-build-j-directive.patch b/hotspot-build-j-directive.patch
new file mode 100644
index 0000000..0ab9d60
--- /dev/null
+++ b/hotspot-build-j-directive.patch
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User andrew
+# Date 1398183426 -3600
+# Node ID b4ea3a87f707e674a144e805084bda0f72ad4e38
+# Parent 00aa9f5a26b9e2c7bdca547201106f76e23a8c01
+Don't substitute 'j' for '-j' inside -I directives
+
+--- jdk8/hotspot/make/linux/makefiles/adjust-mflags.sh Tue Apr 22 17:15:43 2014 +0100
++++ jdk8/hotspot/make/linux/makefiles/adjust-mflags.sh Tue Apr 22 17:17:06 2014 +0100
+@@ -64,7 +64,7 @@
+ echo "$MFLAGS" \
+ | sed '
+ s/^-/ -/
+- s/ -\([^ ][^ ]*\)j/ -\1 -j/
++ s/ -\([^ I][^ ]*\)j/ -\1 -j/
+ s/ -j[0-9][0-9]*/ -j/
+ s/ -j\([^ ]\)/ -j -\1/
+ s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/
+
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 4c20843..58d4418 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -209,6 +209,8 @@ Patch8: set-active-window.patch
Patch9: javadoc-error-jdk-8029145.patch
# More javadoc. Backport from upstream.
Patch10: javadoc-error-jdk-8037484.patch
+# Problem discovered with make 4.0
+Patch11: hotspot-build-j-directive.patch
#
# OpenJDK specific patches
@@ -446,6 +448,7 @@ sh %{SOURCE12}
%patch8
%patch9
%patch10
+%patch11
%patch99
@@ -1133,6 +1136,9 @@ exit 0
%{_jvmdir}/%{jredir}/lib/accessibility.properties
%changelog
+* Thu Jun 12 2014 Omair Majid <omajid at redhat.com> - 1:1.8.0.5-11.b13
+- Add patch from IcedTea to handle -j and -I correctly
+
* Wed Jun 11 2014 Omair Majid <omajid at redhat.com> - 1:1.8.0.5-11.b13
- Backport javadoc fixes from upstream
- Related: rhbz#1107273
More information about the scm-commits
mailing list