[ilmbase] use ucontext only on ix86/x86_64

Rex Dieter rdieter at fedoraproject.org
Sun Sep 8 22:42:16 UTC 2013


commit be3ec24002484b49402bec4867e9157dc3306b34
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Sep 8 17:41:54 2013 -0500

    use ucontext only on ix86/x86_64
    
    avoids FTBFS on arm (patch borrowed from opensuse)

 ilmbase-2.0-1-arm.patch |   12 ++++++++++++
 ilmbase.spec            |    3 +++
 2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/ilmbase-2.0-1-arm.patch b/ilmbase-2.0-1-arm.patch
new file mode 100644
index 0000000..f542044
--- /dev/null
+++ b/ilmbase-2.0-1-arm.patch
@@ -0,0 +1,12 @@
+diff -up ilmbase-2.0.1/IexMath/IexMathFpu.cpp.orig ilmbase-2.0.1/IexMath/IexMathFpu.cpp
+--- ilmbase-2.0.1/IexMath/IexMathFpu.cpp.orig	2013-06-18 14:51:38.000000000 -0500
++++ ilmbase-2.0.1/IexMath/IexMathFpu.cpp	2013-09-08 17:40:19.116158714 -0500
+@@ -53,7 +53,7 @@
+ #endif
+ 
+ 
+-#ifdef HAVE_UCONTEXT_H
++#if defined(HAVE_UCONTEXT_H) && (defined(__x86_64__) || defined(__i386__))
+ 
+ 
+ #include <ucontext.h>
diff --git a/ilmbase.spec b/ilmbase.spec
index 4ef642d..fbe6443 100644
--- a/ilmbase.spec
+++ b/ilmbase.spec
@@ -18,6 +18,8 @@ BuildRequires: pkgconfig(gl) pkgconfig(glu)
 Patch51: ilmbase-2.0.1-no_undefined.patch
 # add Requires.private: gl glu to IlmBase.pc
 Patch53:  ilmbase-1.0.3-pkgconfig.patch
+# use ucontext only on ix86/x86_64, avoid FTBFS on arm (patch borrowed from opensuse)
+Patch54: ilmbase-2.0-1-arm.patch
 
 ## upstream patches
 
@@ -44,6 +46,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %patch51 -p1 -b .no_undefined
 %patch53 -p1 -b .pkgconfig
+%patch54 -p1 -b .arm
 
 #/bootstrap
 


More information about the scm-commits mailing list