[openjdk-8-jre-dcevm] 02/03: Fixed the build failure with GCC 7 (Closes: #853592)

[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-jre-dcevm.

commit 2c87c53d67f9f38f3ad6199e756e73d400ea9313
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 2 09:45:08 2017 +0200

    Fixed the build failure with GCC 7 (Closes: #853592)
---
 debian/changelog                           |  1 +
 debian/control                             |  2 +-
 debian/patches/gcc7-warnings.patch         | 20 ++++++++++++++++++++
 debian/patches/hotspot-disable-werror.diff | 13 +++++++++++++
 debian/patches/series                      |  2 ++
 5 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e864d35..80c144c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 openjdk-8-jre-dcevm (8u112-2) UNRELEASED; urgency=medium
 
+  * Fixed the build failure with GCC 7 (Closes: #853592)
   * Standards-Version updated to 4.1.1
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 23 Aug 2017 01:04:37 +0200
diff --git a/debian/control b/debian/control
index 5b6ac26..75a055a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 10), quilt, openjdk-8-jdk, g++-6, zip
+Build-Depends: debhelper (>= 10), quilt, openjdk-8-jdk, g++-7, zip
 Standards-Version: 4.1.1
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/openjdk-8-jre-dcevm.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/openjdk-8-jre-dcevm.git
diff --git a/debian/patches/gcc7-warnings.patch b/debian/patches/gcc7-warnings.patch
new file mode 100644
index 0000000..6594c80
--- /dev/null
+++ b/debian/patches/gcc7-warnings.patch
@@ -0,0 +1,20 @@
+
+# HG changeset patch
+# User ysuenaga
+# Date 1500289801 -10800
+# Node ID eb11b3f0ae652b8824e4f2146cb19c7f8d4da34d
+# Parent  31123ecdd68581df9f09961fe9f60c1566b69e5a
+8184309: Buld warnings from GCC 7.1 on Fedora 26
+Reviewed-by: kbarrett, vlivanov
+
+--- a/src/share/vm/code/dependencies.cpp
++++ b/src/share/vm/code/dependencies.cpp
+@@ -525,7 +525,7 @@
+         xtty->object("x", arg.metadata_value());
+       }
+     } else {
+-      char xn[10]; sprintf(xn, "x%d", j);
++      char xn[12]; sprintf(xn, "x%d", j);
+       if (arg.is_oop()) {
+         xtty->object(xn, arg.oop_value());
+       } else {
diff --git a/debian/patches/hotspot-disable-werror.diff b/debian/patches/hotspot-disable-werror.diff
new file mode 100644
index 0000000..29ae286
--- /dev/null
+++ b/debian/patches/hotspot-disable-werror.diff
@@ -0,0 +1,13 @@
+# DP: Turn off -Werror for hotspot, overwrites -fpermissive.
+
+--- a/make/linux/makefiles/gcc.make
++++ b/make/linux/makefiles/gcc.make
+@@ -197,7 +197,7 @@
+ endif
+ 
+ # Compiler warnings are treated as errors
+-WARNINGS_ARE_ERRORS = -Werror
++WARNINGS_ARE_ERRORS =
+ 
+ ifeq ($(USE_CLANG), true)
+   # However we need to clean the code up before we can unrestrictedly enable this option with Clang
diff --git a/debian/patches/series b/debian/patches/series
index bc1fed6..0da4511 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,5 @@ light-jdk8u92-b14.patch
 jvmti-getLoadedClasses-java8.patch
 light-jdk8u66-b17-deopt-cp.patch
 dont-clear-f1.patch
+gcc7-warnings.patch
+hotspot-disable-werror.diff

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