[openjdk-8] 01/03: Fixed a hotspot build issue with make 4.0

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository openjdk-8.

commit 5eae2972fdd22b49b936428a9d63de7ccaed57d4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed May 7 12:53:48 2014 +0200

    Fixed a hotspot build issue with make 4.0
---
 debian/patches/make4-compatibility.patch | 38 ++++++++++++++++++++++++++++++++
 debian/rules                             |  1 +
 2 files changed, 39 insertions(+)

diff --git a/debian/patches/make4-compatibility.patch b/debian/patches/make4-compatibility.patch
new file mode 100644
index 0000000..aee97a1
--- /dev/null
+++ b/debian/patches/make4-compatibility.patch
@@ -0,0 +1,38 @@
+Description: Fixes a bug in adjust-mflags.sh that breaks the hotspot build
+ with GNU make 4.0. The adjust-mflags.sh script attempts to replace
+ the -j parameter but it corrupts other parameters containing the character 'j'.
+ make 4.0 is more strict and returns an error in this case.
+ 
+ For example:
+ 
+     -I/home/ebourg/openjdk8/make/common
+ 
+ is transformed into:
+ 
+     -I/home/ebourg/open -j2 -dk8/make/common
+ 
+ This error is caused by this sed expression:
+ 
+     s/ -\([^ 	][^ 	]*\)j/ -\1 -j/
+ 
+ This expression splits a set of concatenated options containing the 'j' character:
+ 
+     -abcdefghijkl  -->  -abcdefghi -jkl
+ 
+ But it breaks the -I parameter which is followed by a path that may contain 'j'
+ (and this is often true when building open*j*dk)
+ 
+ The fix consists in ignoring the concatenated options if '/' is found.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/hotspot/make/linux/makefiles/adjust-mflags.sh
++++ b/hotspot/make/linux/makefiles/adjust-mflags.sh
+@@ -64,7 +64,7 @@
+ 	echo "$MFLAGS" \
+ 	| sed '
+ 		s/^-/ -/
+-		s/ -\([^ 	][^ 	]*\)j/ -\1 -j/
++		s/ -\([^ 	][^/ 	]*\)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/debian/rules b/debian/rules
index 9e3727b..62ae5d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -313,6 +313,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH), sparc64))
 endif
 
 DISTRIBUTION_PATCHES += \
+	debian/patches/make4-compatibility.patch \
         debian/patches/fix-jtreg-location.patch \
 	debian/patches/system-libjpeg.patch \
 	debian/patches/system-libpng.patch \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git