[SCM] mpg123/master: Fix the FTBFS in armhf.

micove-guest at users.alioth.debian.org micove-guest at users.alioth.debian.org
Sun Apr 1 15:07:19 UTC 2012


The following commit has been merged in the master branch:
commit b4afe4d5fc9827e63b3acf880b4fbb1e64f3abe5
Author: Miguel Colon <debian.micove at gmail.com>
Date:   Sun Apr 1 11:05:29 2012 -0400

    Fix the FTBFS in armhf.
    
    Should work now.

diff --git a/debian/rules b/debian/rules
index bc8a8cd..3983c1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,11 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 WRAPPER_TARGETS:=mpg123-oss mpg123-nas mpg123-jack mpg123-openal mpg123-portaudio
 
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
 ifeq ($(OS),linux)
 WRAPPER_TARGETS += mpg123-alsa
 endif
@@ -22,6 +27,7 @@ CONF_arm:=--with-cpu=arm_nofpu
 else
 ifeq ($(ARCH),armhf)
 CONF_arm:=--with-cpu=neon
+CFLAGS += -mfpu=neon
 endif
 endif
 
@@ -32,11 +38,6 @@ LIB_PKGSTR:=-p$(LIB_PKG) -p$(DEV_PKG)
 ARCH_PKGSTR=-pmpg123
 ALL_PKGSTR=$(LIB_PKGSTR) $(ARCH_PKGSTR)
 
-CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-
 LDFLAGS += -Wl,--as-needed
 
 #export DH_VERBOSE=1

-- 
mpg123 packaging



More information about the pkg-multimedia-commits mailing list