From 79a7c9d1e736fbe250abc15662904daa9ef55c16 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Nov 13 2016 02:32:04 +0000 Subject: Disable altivec support on ppc64le for now to avoid "bool" being converted (bug 1393157) - Use __linux__ , gcc does not define __linux on ppc (gcc bug 28314) --- diff --git a/blender-2.78a-linux-definition-ppc64.patch b/blender-2.78a-linux-definition-ppc64.patch new file mode 100644 index 0000000..e13792a --- /dev/null +++ b/blender-2.78a-linux-definition-ppc64.patch @@ -0,0 +1,15 @@ +--- blender-2.78a/extern/glog/src/stacktrace_powerpc-inl.h.debug 2016-10-24 23:13:56.000000000 +0900 ++++ blender-2.78a/extern/glog/src/stacktrace_powerpc-inl.h 2016-11-12 14:55:59.832015717 +0900 +@@ -111,10 +111,10 @@ + result[n++] = *(sp+2); + #elif defined(_CALL_SYSV) + result[n++] = *(sp+1); +-#elif defined(__APPLE__) || (defined(__linux) && defined(__PPC64__)) ++#elif defined(__APPLE__) || (defined(__linux__) && defined(__PPC64__)) + // This check is in case the compiler doesn't define _CALL_AIX/etc. + result[n++] = *(sp+2); +-#elif defined(__linux) ++#elif defined(__linux__) + // This check is in case the compiler doesn't define _CALL_SYSV. + result[n++] = *(sp+1); + #else diff --git a/blender.spec b/blender.spec index 4de6e99..fae759e 100644 --- a/blender.spec +++ b/blender.spec @@ -22,7 +22,7 @@ Name: blender Epoch: 1 Version: %{blender_api}a -Release: 2%{?dist} +Release: 3%{?dist} Summary: 3D modeling, animation, rendering and post-production License: GPLv2 @@ -35,6 +35,9 @@ Source2: %{fontname}.metainfo.xml Source5: %{name}.xml Source10: macros.%{name} #Patch0: blender-2.78-locales-directory.patch +# For ppc64le build, currently being discussed on +# https://lists.blender.org/pipermail/bf-committers/2016-November/047844.html +Patch1: blender-2.78a-linux-definition-ppc64.patch # Development stuff BuildRequires: boost-devel @@ -142,7 +145,7 @@ a composition of several mono space fonts to cover several character sets. %prep -%autosetup +%autosetup -p1 #Fix path for international fonts. thanks ignatenkobrain sed -e 's|BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts")|"/usr/share/fonts"|g' \ source/%{name}/blenfont/intern/blf_font_i18n.c @@ -159,6 +162,13 @@ mkdir cmake-make pushd cmake-make export CFLAGS="$RPM_OPT_FLAGS -fPIC -funsigned-char -fno-strict-aliasing -std=c++11" export CXXFLAGS="$CFLAGS" + +%ifarch ppc64le +# Disable altivec for now, bug 1393157 +# https://lists.blender.org/pipermail/bf-committers/2016-November/047844.html +export CXXFLAGS="$CXXFLAGS -mno-altivec" +%endif + cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} \ %ifnarch %{ix86} x86_64 -DWITH_RAYOPTIMIZATION=OFF \ @@ -358,6 +368,11 @@ fi %license release/datafiles/LICENSE-bmonofont-i18n.ttf.txt %changelog +* Sat Nov 12 2016 Mamoru TASAKA - 1:2.78a-3 +- Disable altivec support on ppc64le for now to avoid "bool" being converted + (bug 1393157) +- Use __linux__ , gcc does not define __linux on ppc (gcc bug 28314) + * Tue Nov 08 2016 Luya Tshimbalanga - 1:2.78a-2 - Corrected versioning of obsoleted fonts-blender (rhbz#1393006)