[SCM] mplayer/master: Revert "enable hardened buildflags"

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat Jan 19 15:09:27 UTC 2013


The following commit has been merged in the master branch:
commit 758f1e11f1d6aa4a78daab0cc472cff7426764a7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 19 16:09:18 2013 +0100

    Revert "enable hardened buildflags"
    
    Unfortunately, hardened build flags break the compilation and need
    additional patches upstream.
    
    This reverts commit e7e0368ea43ce4ac8ec12ef3df08d0df1f14d04f.

diff --git a/debian/rules b/debian/rules
index 24ed16e..bbea99e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,9 +27,6 @@ DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
 SVN_VERSION := $(shell echo $(UPSTREAM_VERSION) | sed -nr 's/^[0-9.:-~]+\+svn([0-9]+)$$/\1/p')
 
-CFLAGS = `dpkg-buildflags --get CFLAGS`
-CFLAGS += `dpkg-buildflags --get CPPFLAGS`
-LDFLAGS = `dpkg-buildflags --get LDFLAGS`
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -52,8 +49,6 @@ CONFIGURE_FLAGS = \
 	--disable-libdvdcss-internal \
 	--disable-libmpeg2-internal \
 	--disable-ffmpeg_a \
-	--extra-cflags="${CFLAGS}" \
-	--extra-ldflags="${LDFLAGS}" \
 	$(archconf)
 
 ifeq ($(DEB_HOST_ARCH),i386)

-- 
mplayer packaging



More information about the pkg-multimedia-commits mailing list