[SCM] mpg123/master: Remove -marm. Was not needed and it's now properly fixed upstream.

micove-guest at users.alioth.debian.org micove-guest at users.alioth.debian.org
Sat Apr 14 05:46:44 UTC 2012


The following commit has been merged in the master branch:
commit ef909579aea94093e3f03fbd57be75f58c152bcc
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date:   Sat Apr 14 01:18:07 2012 -0400

    Remove -marm. Was not needed and it's now properly fixed upstream.
    
    Revert "Add -marm to CFLAGS to fix FTBFS on armhf."
    .
    This reverts commit 87e29c6562d56899d14f1f24d8d212db41628498.
    .
    The default -mthumb is better than -marm.

diff --git a/debian/rules b/debian/rules
index 87c1f07..3983c1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,10 +38,6 @@ LIB_PKGSTR:=-p$(LIB_PKG) -p$(DEV_PKG)
 ARCH_PKGSTR=-pmpg123
 ALL_PKGSTR=$(LIB_PKGSTR) $(ARCH_PKGSTR)
 
-ifeq ($(ARCH),armhf)
-  CFLAGS += -marm
-endif
-
 LDFLAGS += -Wl,--as-needed
 
 #export DH_VERBOSE=1

-- 
mpg123 packaging



More information about the pkg-multimedia-commits mailing list