[openjfx] 01/04: Fixed the build failure with GCC 6 (Closes: #837021)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Nov 24 15:39:01 UTC 2016 

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

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

commit 7402e3f256e236c22e461d25e3a1eb3a4f0c5bd0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Nov 24 15:12:45 2016 +0100

    Fixed the build failure with GCC 6 (Closes: #837021)
---
 debian/changelog                          |  1 +
 debian/patches/03-buildflags.patch        | 33 +++++++++++++++----------------
 debian/patches/17-gcc-compatibility.patch | 25 +++++++++++++++++++++++
 debian/patches/fix-arm32-build.patch      |  2 +-
 debian/patches/series                     |  1 +
 5 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1dbeb25..c86281f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 openjfx (8u102-b14-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed the build failure with GCC 6 (Closes: #837021)
   * Transition to libswt-gtk-4-java
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 09 Aug 2016 17:21:52 +0200
diff --git a/debian/patches/03-buildflags.patch b/debian/patches/03-buildflags.patch
index e5ecff4..4cb0d52 100644
--- a/debian/patches/03-buildflags.patch
+++ b/debian/patches/03-buildflags.patch
@@ -1,11 +1,9 @@
 Description: Adjusts the compiler flags to enable the hardening and link to the system libraries
 Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
-Index: b/buildSrc/linux.gradle
-===================================================================
 --- a/buildSrc/linux.gradle
 +++ b/buildSrc/linux.gradle
-@@ -45,6 +45,9 @@ def commonFlags = [
+@@ -45,6 +45,9 @@
          "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
          "-W", "-Wall", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags
  
@@ -15,7 +13,7 @@ Index: b/buildSrc/linux.gradle
  if (!IS_64) {
      commonFlags += "-m32"
  }
-@@ -54,7 +57,10 @@ def ccFlags = [
+@@ -54,7 +57,10 @@
          commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c",
          IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten()
  //ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"])
@@ -26,7 +24,16 @@ Index: b/buildSrc/linux.gradle
  
  // Create $buildDir/linux_tools.properties file and load props from it
  setupTools("linux_tools",
-@@ -196,7 +202,7 @@ LINUX.iio.nativeSource = [
+@@ -180,7 +186,7 @@
+ 
+ LINUX.launcherlibrary = [:]
+ LINUX.launcherlibrary.compiler = compiler
+-LINUX.launcherlibrary.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", "-fPIC"]
++LINUX.launcherlibrary.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", "-fPIC", "-std=gnu++98"]
+ LINUX.launcherlibrary.linker = linker
+ LINUX.launcherlibrary.linkFlags = ["-ldl", "-lpthread", "-shared"]
+ if (!IS_64) {
+@@ -196,7 +202,7 @@
  LINUX.iio.compiler = compiler
  LINUX.iio.ccFlags = [ccFlags].flatten()
  LINUX.iio.linker = linker
@@ -35,11 +42,9 @@ Index: b/buildSrc/linux.gradle
  LINUX.iio.lib = "javafx_iio"
  
  LINUX.prismES2 = [:]
-Index: b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
-===================================================================
 --- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
 +++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
-@@ -26,11 +26,9 @@ CFLAGS = -fPIC                   \
+@@ -26,11 +26,9 @@
           -DGST_DISABLE_LOADSAVE  \
           -DGSTREAMER_LITE
  
@@ -54,11 +59,9 @@ Index: b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefil
  
  PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
  PACKAGES_LIBS     := $(shell pkg-config --libs glib-2.0 gobject-2.0)
-Index: b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
-===================================================================
 --- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
 +++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
-@@ -27,12 +27,9 @@ CFLAGS = -fPIC                   \
+@@ -27,12 +27,9 @@
           -DGST_DISABLE_GST_DEBUG \
           -DGSTREAMER_LITE
  
@@ -74,11 +77,9 @@ Index: b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefi
  
  INCLUDES = -I$(SRCBASE_DIR) \
  	   $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \
-Index: b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
-===================================================================
 --- a/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
 +++ b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
-@@ -48,11 +48,9 @@ CFLAGS =-fPIC                   \
+@@ -48,11 +48,9 @@
          -DGST_DISABLE_GST_DEBUG \
          -DGST_DISABLE_LOADSAVE
  
@@ -93,11 +94,9 @@ Index: b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/M
  
  INCLUDES = -I$(BASE_DIR)/plugins                          \
  	   -I$(SRCBASE_DIR)/projects/build/linux/common   \
-Index: b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
-===================================================================
 --- a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
 +++ b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
-@@ -59,11 +59,9 @@ else
+@@ -59,11 +59,9 @@
  	LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) $(EXTRA_LDFLAGS)
  endif
  
diff --git a/debian/patches/17-gcc-compatibility.patch b/debian/patches/17-gcc-compatibility.patch
new file mode 100644
index 0000000..8001537
--- /dev/null
+++ b/debian/patches/17-gcc-compatibility.patch
@@ -0,0 +1,25 @@
+Description: Fixes a build error with GCC 6
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+Bug-Debian: https://bugs.debian.org/837021
+diff --git a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
+index 5c8f4b9..7c35213 100644
+--- a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
++++ b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
+@@ -46,6 +46,7 @@
+ #include <iostream>
+ #include <dlfcn.h>
+ #include <signal.h>
++#include <sys/wait.h>
+ 
+ 
+ PosixPlatform::PosixPlatform(void) {
+@@ -232,7 +233,7 @@ bool PosixProcess::Wait() {
+ 
+     //TODO Use waitpid instead of wait
+ #ifdef LINUX
+-    wait();
++    wait(&status);
+ #endif
+ #ifdef MAC
+     wpid = wait(&status);
diff --git a/debian/patches/fix-arm32-build.patch b/debian/patches/fix-arm32-build.patch
index 2179389..392bedc 100644
--- a/debian/patches/fix-arm32-build.patch
+++ b/debian/patches/fix-arm32-build.patch
@@ -88,7 +88,7 @@ Index: b/buildSrc/linux.gradle
  
  LINUX.launcherlibrary = [:]
  LINUX.launcherlibrary.compiler = compiler
- LINUX.launcherlibrary.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", "-fPIC"]
+ LINUX.launcherlibrary.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", "-fPIC", "-std=gnu++98"]
  LINUX.launcherlibrary.linker = linker
  LINUX.launcherlibrary.linkFlags = ["-ldl", "-lpthread", "-shared"]
 -if (!IS_64) {
diff --git a/debian/patches/series b/debian/patches/series
index de1c28b..28ab6a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ fix-arm64-build.patch
 fix-arm32-build.patch
 15-fix-javadoc-refererences.diff
 16-reproducible-build-timestamp.patch
+17-gcc-compatibility.patch

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

More information about the pkg-java-commits mailing list