tags 319235 patch thanks Hi Matt,
I've prepared an NMU that sets -fno-inline-functions on m68k to work around the compiler bug there (-finline-functions is being set in the upstream configure script). In the process, I found a couple of other issues in debian/rules, which I've addressed. Please find the patch attached. I'll plan to upload this NMU in the morning if it builds successfully for me here on i386. Cheers, -- Steve Langasek postmodern programmer
diff -u flac-1.1.1/debian/changelog flac-1.1.1/debian/changelog
--- flac-1.1.1/debian/changelog
+++ flac-1.1.1/debian/changelog
@@ -1,3 +1,18 @@
+flac (1.1.1-5.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Negate upstream use of -finline-functions on m68k, to work around a
+ compiler failure there. Closes: #319235.
+ * Use DEB_HOST_ARCH instead of DEB_BUILD_ARCH for per-arch checks, for
+ correctness wrt cross-building
+ * Force -O0 when DEB_BUILD_OPTIONS=debug is set, because by default
+ upstream is using -O3 -- so removing -O2 from CFLAGS was forcing a
+ *higher* level of optimization instead.
+ * Set CXXFLAGS as well as CFLAGS, so that C++ sources are also handled
+ correctly
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Sat, 30 Jul 2005 03:15:50 -0700
+
flac (1.1.1-5.1) unstable; urgency=medium
* Non-maintainer upload.
diff -u flac-1.1.1/debian/rules flac-1.1.1/debian/rules
--- flac-1.1.1/debian/rules
+++ flac-1.1.1/debian/rules
@@ -24,22 +24,29 @@
ifeq "$(findstring debug,$(DEB_BUILD_OPTIONS))" ""
CFLAGS += -O2
+else
+CFLAGS += -O0
endif
-DEB_BUILD_ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
-ifeq ($(DEB_BUILD_ARCH),powerpc)
+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
+endif
configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
- CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --mandir=/usr/share/man \
+ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
+ --mandir=/usr/share/man \
$(EXTRA_CONFIGURE_ARGS)
touch configure-stamp
signature.asc
Description: Digital signature
