[openjfx] 01/01: * Kill more -m32 settings.

[Matthias Klose]

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

doko pushed a commit to branch master
in repository openjfx.

commit 2f3e6dc67371002bb8ee197ffb32b7e15165f8eb
Author: Matthias Klose <doko at ubuntu.com>
Date:   Thu Oct 8 18:06:52 2015 +0200

      * Kill more -m32 settings.
---
 debian/changelog                     |  6 ++++++
 debian/patches/fix-arm32-build.patch | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f7bedbe..f51fd11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openjfx (8u60-b27-3) UNRELEASED; urgency=medium
+
+  * Kill more -m32 settings.
+
+ -- Matthias Klose <doko at ubuntu.com>  Thu, 08 Oct 2015 18:05:59 +0200
+
 openjfx (8u60-b27-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/fix-arm32-build.patch b/debian/patches/fix-arm32-build.patch
index 8b8a936..2179389 100644
--- a/debian/patches/fix-arm32-build.patch
+++ b/debian/patches/fix-arm32-build.patch
@@ -62,3 +62,39 @@ Index: b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
  CPP_SOURCES = \
          jni/com_sun_media_jfxmedia_logging_Logger.cpp           \
          jni/JavaBandsHolder.cpp 				\
+Index: b/buildSrc/linux.gradle
+===================================================================
+--- a/buildSrc/linux.gradle
++++ b/buildSrc/linux.gradle
+@@ -48,10 +48,6 @@ def commonFlags = [
+ commonFlags.addAll("dpkg-buildflags --get CPPFLAGS  ".execute().text.trim().split(" "))
+ commonFlags.addAll("dpkg-buildflags --get CXXFLAGS".execute().text.trim().split(" "))
+ 
+-if (!IS_64) {
+-    commonFlags += "-m32"
+-}
+-
+ // Specify the compilation parameters and link parameters
+ def ccFlags = [
+         commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c",
+@@ -179,20 +175,12 @@ LINUX.launcher.compiler = compiler
+ LINUX.launcher.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c"]
+ LINUX.launcher.linker = linker
+ LINUX.launcher.linkFlags = ["-ldl"]
+-if (!IS_64) {
+-    LINUX.launcher.ccFlags += "-m32"
+-    LINUX.launcher.linkFlags += "-m32"
+-}
+ 
+ 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.linker = linker
+ LINUX.launcherlibrary.linkFlags = ["-ldl", "-lpthread", "-shared"]
+-if (!IS_64) {
+-    LINUX.launcherlibrary.ccFlags += "-m32"
+-    LINUX.launcherlibrary.linkFlags += "-m32"
+-}
+ 
+ LINUX.iio = [:]
+ LINUX.iio.javahInclude = ["com/sun/javafx/iio/**/*"]

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