[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.18-1-1-gdb55355

[sjoerd at users.alioth.debian.org]

The branch, master has been updated
       via  db553558c1895f7c45f9a9407e266f1d764a61c3 (commit)
      from  b91221ceeb3c55b66b0bd85bfef4aa677d1b6e4f (commit)


- Shortlog ------------------------------------------------------------
db55355 Only compile the ARMv6 optimized code with -march=armv6  (Closes: #546322)

Summary of changes:
 debian/changelog |    6 ++++++
 debian/rules     |    9 +++++----
 2 files changed, 11 insertions(+), 4 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit db553558c1895f7c45f9a9407e266f1d764a61c3
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sat Oct 3 17:40:24 2009 +0100

    Only compile the ARMv6 optimized code with -march=armv6  (Closes: #546322)

diff --git a/debian/changelog b/debian/changelog
index 2f899f8..50fb936 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pulseaudio (0.9.18-2) UNRELEASED; urgency=low
+
+  * Only compile the ARMv6 optimized code with -march=armv6  (Closes: #546322)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 03 Oct 2009 17:39:20 +0100
+
 pulseaudio (0.9.18-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index 8f36c0e..9d0b908 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,11 @@ common-install-arch::
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/lintian
 	cp -a $(CURDIR)/debian/overrides $(CURDIR)/debian/tmp/usr/share/lintian
 
+common-configure-arch::
+ifneq (,$(findstring $(DEB_HOST_ARCH), "arm armel"))
+	make -C src libpulsecore_0.9.18_la-svolume_arm.lo CFLAGS+=-march=armv6
+endif
+
 pulseaudio-install-arch::
 	dh_installman --language=C debian/tmp/usr/share/man/man5/default.pa.5
 
@@ -44,7 +49,3 @@ DEB_DH_SHLIBDEPS_ARGS_libpulse0 = -u -L/dev/null
 DEB_DH_SHLIBDEPS_ARGS_pulseaudio = -u -Ldebian/shlibs_pulseaudio.local
 DEB_DH_INSTALL_ARGS = --sourcedir=$(CURDIR)/debian/tmp
 DEB_UPDATE_RCD_PARAMS = start 25 2 3 4 5 . stop 15 1 .
-
-ifneq (,$(findstring $(DEB_HOST_ARCH), "arm armel"))
-  CFLAGS += -march=armv6
-endif

-- 
pulseaudio packaging