[openjfx] 02/03: Disabled the architecture verification in build.gradle

[Emmanuel Bourg]

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

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

commit f025ac78c27ea6baf355c781591a85c9990b58c6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 19 13:58:46 2014 +0200

    Disabled the architecture verification in build.gradle
---
 debian/changelog                                    |  2 ++
 .../06-disable-architecture-verification.patch      | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 23b0d97..4e41b50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ openjfx (8u20-b26-3) UNRELEASED; urgency=medium
 
   * Fixed a build failure on slow machines by increasing the timeout
     for processing the ANTLR grammar.
+  * Disabled the architecture verification in build.gradle to attempt building
+    on more archs than i386 and amd64
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 19 Sep 2014 13:47:51 +0200
 
diff --git a/debian/patches/06-disable-architecture-verification.patch b/debian/patches/06-disable-architecture-verification.patch
new file mode 100644
index 0000000..ca26b63
--- /dev/null
+++ b/debian/patches/06-disable-architecture-verification.patch
@@ -0,0 +1,21 @@
+Description: Disable the architecture verification which is limited to i386 and amd64
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/build.gradle
++++ b/build.gradle
+@@ -661,6 +661,7 @@
+ // at present building on PI is not supported, but we would only need to make
+ // some changes on assumptions on what should be built (like SWT / Swing) and
+ // such and we could probably make it work.
++/*
+ if (!IS_MAC && !IS_WINDOWS && !IS_LINUX) logger.error("Unsupported build OS ${OS_NAME}")
+ if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") {
+     throw new Exception("Unknown and unsupported build architecture: $OS_ARCH")
+@@ -669,6 +670,7 @@
+ } else if (IS_LINUX && OS_ARCH != "i386" && OS_ARCH != "amd64") {
+     throw new Exception("Unknown and unsupported build architecture: $OS_ARCH")
+ }
++*/
+ 
+ // Sanity check that we actually have a list of compile targets to execute
+ if (COMPILE_TARGETS == null || COMPILE_TARGETS == "") {
diff --git a/debian/patches/series b/debian/patches/series
index 7d82053..5fef846 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 03-buildflags.patch
 04-libav-compatibility.patch
 05-set-antlr-timeout.patch
+06-disable-architecture-verification.patch

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