tags 525826 patch
tags 525829 patch
thanks
Patch attached.
Bastian
diff -u flac-1.2.1/debian/control flac-1.2.1/debian/control
--- flac-1.2.1/debian/control
+++ flac-1.2.1/debian/control
@@ -2,7 +2,7 @@
Section: sound
Priority: optional
Maintainer: Joshua Kwan <jo...@triplehelix.org>
-Build-Depends: debhelper (>= 4), nasm (>= 0.99.02-1) [i386], doxygen,
libid3-3.8.3-dev (>= 3.8.3-4.2), libogg-dev, g++ (>= 2:3.2), dpatch
+Build-Depends: debhelper (>= 4), doxygen, libid3-3.8.3-dev (>= 3.8.3-4.2),
libogg-dev, g++ (>= 2:3.2), dpatch
Standards-Version: 3.7.2
Package: flac
diff -u flac-1.2.1/debian/rules flac-1.2.1/debian/rules
--- flac-1.2.1/debian/rules
+++ flac-1.2.1/debian/rules
@@ -7,33 +7,27 @@
tmp:=debian/tmp
tmp_absolute:=$(top_srcdir)/$(tmp)
-CFLAGS=-g
-
-ifeq "$(findstring debug,$(DEB_BUILD_OPTIONS))" ""
-CFLAGS += -O2
-else
-CFLAGS += -O0
-endif
-
+DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-ifeq ($(DEB_HOST_ARCH),powerpc)
-EXTRA_CONFIGURE_ARGS:=--disable-asm-optimizations
-else
ifeq ($(DEB_HOST_ARCH),m68k)
CFLAGS += -fno-inline-functions
-else
-EXTRA_CONFIGURE_ARGS=
endif
+
+CONFIGURE_ARGS = --build=$(DEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+CONFIGURE_ARGS += --host=$(DEB_HOST_GNU_TYPE)
endif
configure: patch configure-stamp
configure-stamp: patch-stamp
dh_testdir
- CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
- --mandir=/usr/share/man --disable-rpath $(EXTRA_CONFIGURE_ARGS)
- --disable-xmms-plugin
+ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" ./configure $(CONFIGURE_ARGS) \
+ --prefix=/usr --mandir=/usr/share/man --disable-rpath \
+ --disable-xmms-plugin \
+ --disable-asm-optimizations
sh debian/fixrpath
touch $@
diff -u flac-1.2.1/debian/changelog flac-1.2.1/debian/changelog
--- flac-1.2.1/debian/changelog
+++ flac-1.2.1/debian/changelog
@@ -1,3 +1,11 @@
+flac (1.2.1-1.3) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Disable use of asembler optimizations. (closes: #525826)
+ * Provide proper architecture information to build system. (closes: #525829)
+
+ -- Bastian Blank <wa...@debian.org> Mon, 27 Apr 2009 13:09:23 +0000
+
flac (1.2.1-1.2) unstable; urgency=low
* Non-maintainer upload.
