Add patch to handle -j and -I correctly

This is a fix for build-breakage seen with make 4.0
This commit is contained in:
Omair Majid 2014-06-12 11:53:16 -04:00
parent e9e0f6d58e
commit 87ae8e7a61
2 changed files with 25 additions and 0 deletions

View File

@ -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}}'/

View File

@ -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@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@redhat.com> - 1:1.8.0.5-11.b13
- Backport javadoc fixes from upstream
- Related: rhbz#1107273