[OpenImageIO] Do not build against TBB for i686 because it fails.
Richard Shaw
hobbes1069 at fedoraproject.org
Tue Mar 13 21:30:59 UTC 2012
commit 03f891ce4c1c7db69ff2437e46c0d06f89221c9a
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date: Tue Mar 13 16:30:55 2012 -0500
Do not build against TBB for i686 because it fails.
OpenImageIO.spec | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 365f8ce..7ebbde1 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -3,7 +3,7 @@
Name: OpenImageIO
Version: 1.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Library for reading and writing images
Group: Development/Libraries
@@ -18,10 +18,12 @@ Patch1: OpenImageIO-1.0.0-tbb_include.patch
BuildRequires: boost-devel glew-devel qt-devel OpenEXR-devel ilmbase-devel
BuildRequires: python2-devel txt2man
-BuildRequires: libpng-devel libtiff-devel
+BuildRequires: libpng-devel libtiff-devel openjpeg-devel
BuildRequires: zlib-devel jasper-devel
BuildRequires: pugixml-devel
+%ifarch x86_64
BuildRequires: tbb-devel
+%endif
BuildRequires: hdf5-devel Field3D-devel
# We don't want to provide private python extension libs
@@ -81,8 +83,12 @@ pushd build
-DPYLIB_INSTALL_DIR:PATH=%{python_sitearch} \
-DINSTALL_DOCS:BOOL=FALSE \
-DUSE_EXTERNAL_PUGIXML:BOOL=TRUE \
+%ifarch x86_64
-DUSE_TBB:BOOL=TRUE \
-DUSE_EXTERNAL_TBB=TRUE \
+%else
+ -DUSE_TBB:BOOL=FALSE \
+%endif
../src
make %{?_smp_mflags}
@@ -119,6 +125,9 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
%changelog
+* Tue Mar 13 2012 Richard Shaw <hobbes1069 at gmail.com> - 1.0.0-2
+- Do not build against TBB for i686 because it fails.
+
* Fri Mar 02 2012 Richard Shaw <hobbes1069 at gmail.com> - 1.0.0-1
- Update to latest upstream release.
More information about the scm-commits
mailing list