From 9efba4745cc8b86d1a509211b5e801ac26dc235a Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: May 05 2017 12:18:49 +0000 Subject: ExcludeArchs --- diff --git a/assimp-3.3.1-bigendian.patch b/assimp-3.3.1-bigendian.patch deleted file mode 100644 index 42c04dc..0000000 --- a/assimp-3.3.1-bigendian.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- assimp-3.3.1/CMakeLists.txt.bigend 2017-04-29 12:09:43.715099402 +0200 -+++ assimp-3.3.1/CMakeLists.txt 2017-04-29 12:11:47.897726270 +0200 -@@ -250,6 +250,12 @@ - - MARK_AS_ADVANCED ( ASSIMP_BUILD_ARCHITECTURE ASSIMP_BUILD_COMPILER ) - -+INCLUDE(TestBigEndian) -+ -+TEST_BIG_ENDIAN(BIGENDIAN) -+IF(${BIGENDIAN}) -+ ADD_DEFINITIONS(-DAI_BUILD_BIG_ENDIAN) -+ENDIF(${BIGENDIAN}) - - SET ( ASSIMP_BUILD_NONFREE_C4D_IMPORTER OFF CACHE BOOL - "Build the C4D importer, which relies on the non-free Melange SDK." diff --git a/assimp.spec b/assimp.spec index ac24637..4b1a37b 100644 --- a/assimp.spec +++ b/assimp.spec @@ -1,6 +1,6 @@ Name: assimp Version: 3.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library to import various 3D model formats into applications Group: Development/Libraries # Assimp is BSD, the bundled openddlparser is MIT. @@ -11,6 +11,8 @@ URL: http://assimp.sourceforge.net # using assimp_generate_tarball.sh Source0: %{name}-%{version}-free.tar.xz Source1: assimp_generate_tarball.sh +# Current 3.3.1 not compilable under s390x and ppc64le - BigEndian issues +ExcludeArch: s390x ppc64le Patch0: %{name}-3.3.1-unbundle.patch # Add /usr/lib64 to library lookup paths for python modules Patch1: %{name}-3.2.0-pythonpath.patch @@ -18,7 +20,6 @@ Patch1: %{name}-3.2.0-pythonpath.patch # Fixes rhbz#1263698, not submitted upstream # Rehashed to 3.3.1 Patch2: 0001-Assimp-cmake-provider-fix.patch -Patch3: assimp-3.3.1-bigendian.patch #Upstream backports # Collada morph animation Patch100: 0001-Morph-animation-support-for-collada.patch @@ -109,7 +110,6 @@ rm -rf contrib/poly2tri %patch0 -p1 -b .unbundle %patch1 -p1 -b .pythonpath %patch2 -p1 -b .cmakefix -%patch3 -p1 -b .bigendian # Backported from upstream %patch100 -p1 -b .docfix %patch101 -p1 -b .qt3d @@ -179,6 +179,9 @@ rm -rf %{buildroot} %endif %changelog +* Fri May 05 2017 Helio Chissini de Castro - 3.3.1-4 +- Disable ppc64le and s390x arches due bigendian issue not yet solved + * Sat Apr 29 2017 Helio Chissini de Castro - 3.3.1-3 - Compile assimp with current exterbal irrXML