[SCM] Debian packaging for jack-audio-connection-kit branch, master, updated. debian/0.118+svn3796-3-20-gaf67c19

js at users.alioth.debian.org js at users.alioth.debian.org
Thu Mar 11 01:34:24 UTC 2010


The following commit has been merged in the master branch:
commit 5ec1db98c8d32c4aca603f3703a10bbcb656575d
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Mar 11 02:25:21 2010 +0100

    Declare DEB_BUILD_ARCH simply-expanded (while still allowing early override, and use filter (not findstring or grep) to parse it.

diff --git a/debian/rules b/debian/rules
index 554c2a5..ebbeede 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,8 +30,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-resize \
 	--disable-ensure-mlock --enable-sse=yes --enable-static=yes
 	# --enable-posix-shm
 
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-ifneq (,$(findstring amd64,$(DEB_BUILD_ARCH)))
+_build_arch := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH ?= $(_build_arch)
+ifneq (,$(filter amd64,$(DEB_BUILD_ARCH)))
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-dynsimd=yes
 endif
 
@@ -66,7 +67,7 @@ ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 # endif
 endif
 
-ifneq (,$(shell echo amd64 | grep $(DEB_BUILD_ARCH)))
+ifneq (,$(filter amd64,$(DEB_BUILD_ARCH)))
 CFLAGS += -m3dnow -msse
 endif
 

-- 
Debian packaging for jack-audio-connection-kit



More information about the pkg-multimedia-commits mailing list