[SCM] blender/master: debian/rules: fix FTBFS on some archs without OIIO support

mfv-guest at users.alioth.debian.org mfv-guest at users.alioth.debian.org
Tue Mar 5 15:39:32 UTC 2013


The following commit has been merged in the master branch:
commit b7a3ba2a957c25b7e41a984fefe583ac23fe557f
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Tue Mar 5 15:01:06 2013 +0100

    debian/rules: fix FTBFS on some archs without OIIO support

diff --git a/debian/rules b/debian/rules
index 252772e..56de511 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,12 @@
 #!/usr/bin/make -f
 
 INSTDIR = debian/tmp
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
-ifeq ($(DEB_BUILD_ARCH),amd64)
-	confflags += -DWITH_CYCLES=ON
-endif
-
-ifeq ($(DEB_BUILD_ARCH),i386)
-	confflags += -DWITH_CYCLES=ON
+ifneq (,$(filter $(DEB_HOST_ARCH_CPU),amd64 i386))
+        confflags += -DWITH_CYCLES=ON
+else
+        confflags += -DWITH_CYCLES=OFF
 endif
 
 # Adapted from http://wiki.debian.org/SandroTosi/Svn_get-orig-source

-- 
blender packaging



More information about the pkg-multimedia-commits mailing list