[Git][java-team/openjfx][master] 2 commits: Fix !x86 build

[Markus Koschany]

Markus Koschany pushed to branch master at Debian Java Maintainers / openjfx


Commits:
2c15126f by Frédéric Bonnard at 2018-10-10T14:18:46Z
Fix !x86 build

Properly define CMAKE_SYSTEM_PROCESSOR else we get x86_64 or i586
whichever architecture.
Set ENABLE_JIT=OFF at cmake level for all non x86 architectures.

- - - - -
ca360e02 by Markus Koschany at 2018-10-10T20:31:07Z
Merge branch 'fix-non-x86-build' into 'master'

Fix !x86 build

See merge request java-team/openjfx!1
- - - - -


2 changed files:

- + debian/patches/disable-jit-for-non-x86.patch
- debian/patches/series


Changes:

=====================================
debian/patches/disable-jit-for-non-x86.patch
=====================================
@@ -0,0 +1,20 @@
+--- a/build.gradle
++++ b/build.gradle
+@@ -3886,11 +3886,17 @@
+                         cmakeArgs = "-DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_MIN_VERSION -DCMAKE_OSX_SYSROOT=$MACOSX_SDK_PATH"
+                     } else if (t.name == "linux") {
+                         cmakeArgs = "-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_C_COMPILER=${webkitProperties.compiler}"
++                        /*
+                         if (IS_64) {
+                             cmakeArgs = "$cmakeArgs -DCMAKE_SYSTEM_PROCESSOR=x86_64"
+                         } else {
+                             cmakeArgs = "$cmakeArgs -DCMAKE_SYSTEM_PROCESSOR=i586"
+                         }
++                        */
++                        if ( OS_ARCH != "amd64" && OS_ARCH != "i386" ) {
++                            cmakeArgs = "$cmakeArgs -DENABLE_JIT=OFF"
++                        }
++                        cmakeArgs = "$cmakeArgs -DCMAKE_SYSTEM_PROCESSOR=$OS_ARCH"
+                         // TODO: Use cflags and ldflags from all platforms
+                         def cFlags = webkitProperties.ccFlags?.join(' ') ?: ''
+                         def lFlags = webkitProperties.linkFlags?.join(' ') ?: ''


=====================================
debian/patches/series
=====================================
@@ -14,3 +14,4 @@ fix-arm32-build.patch
 25-webkit-debug-level.patch
 26-disable-webkit-jit-for-armv4.patch
 29-glibc-compatibility.patch
+disable-jit-for-non-x86.patch



View it on GitLab: https://salsa.debian.org/java-team/openjfx/compare/716bf95767083f410dfd5b9882ad46fd2a3db77f...ca360e021e875a86b9d7c764817714e0cec2959f

-- 
View it on GitLab: https://salsa.debian.org/java-team/openjfx/compare/716bf95767083f410dfd5b9882ad46fd2a3db77f...ca360e021e875a86b9d7c764817714e0cec2959f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181010/20dad453/attachment.html>