[openjfx] 01/11: Fixed a build failure on powerpc caused by a different ucontext_t definition

[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 5fd9d9c8509fedb4bb16bd63f071fd3771a5f605
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Apr 20 10:15:28 2017 +0200

    Fixed a build failure on powerpc caused by a different ucontext_t definition
---
 debian/changelog                      |  7 +++++++
 debian/patches/20-fix-ppc-build.patch | 17 +++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f63c8e7..154e573 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openjfx (8u131-b11-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fixed a build failure on powerpc caused by a different ucontext_t definition
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 20 Apr 2017 10:12:13 +0200
+
 openjfx (8u131-b11-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/20-fix-ppc-build.patch b/debian/patches/20-fix-ppc-build.patch
new file mode 100644
index 0000000..9884f73
--- /dev/null
+++ b/debian/patches/20-fix-ppc-build.patch
@@ -0,0 +1,17 @@
+Description: Fixes a build failure on ppc
+Origin: backport, http://trac.webkit.org/changeset/198919/webkit
+Bug: https://bugs.webkit.org/show_bug.cgi?id=156015
+--- a/modules/web/src/main/native/Source/JavaScriptCore/heap/MachineStackMarker.cpp
++++ b/modules/web/src/main/native/Source/JavaScriptCore/heap/MachineStackMarker.cpp
+@@ -86,7 +86,11 @@
+     }
+ 
+     ucontext_t* userContext = static_cast<ucontext_t*>(ucontext);
++#if CPU(PPC)
++    thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
++#else
+     thread->suspendedMachineContext = userContext->uc_mcontext;
++#endif
+ 
+     // Allow suspend caller to see that this thread is suspended.
+     // sem_post is async-signal-safe function. It means that we can call this from a signal handler.
diff --git a/debian/patches/series b/debian/patches/series
index d991d63..d0c297d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ fix-arm32-build.patch
 16-reproducible-build-timestamp.patch
 17-gcc-compatibility.patch
 19-disable-webkit-sampling-profiler.patch
+20-fix-ppc-build.patch

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