Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: pu
Hi,
due to a bug in its rules file, the apr package in wheezy has been built
without the compile options '-g -O2 -pipe -Wall'. This makes the debug
information in the libapr1-dbg package useless. I would therefore like
to fix this in wheezy. Of course, due to the switched on optimization
there is a small chance that this will break something. But the
identical fix has now been in unstable/testing for over 6 weeks without
problems. And apr has an extensive testsuite that is executed during
build.
Debdiff is attached.
Cheers,
Stefan
diff -Nru apr-1.4.6/debian/changelog apr-1.4.6/debian/changelog
--- apr-1.4.6/debian/changelog 2012-05-28 16:02:12.000000000 +0200
+++ apr-1.4.6/debian/changelog 2013-07-03 11:35:01.000000000 +0200
@@ -1,3 +1,10 @@
+apr (1.4.6-3+deb7u1) stable; urgency=low
+
+ * Don't override CFLAGS and LDFLAGS during build. This fixes the debug
+ information being useless. Closes: #703466
+
+ -- Stefan Fritsch <s...@debian.org> Wed, 03 Jul 2013 11:33:06 +0200
+
apr (1.4.6-3) unstable; urgency=low
* Fix some issues with resolving loopback addresses of a protocol family
diff -Nru apr-1.4.6/debian/rules apr-1.4.6/debian/rules
--- apr-1.4.6/debian/rules 2012-05-19 16:06:37.000000000 +0200
+++ apr-1.4.6/debian/rules 2013-07-03 11:29:34.000000000 +0200
@@ -68,7 +68,7 @@
# we need to force the use of bash here. Otherwise, if apr is built with
# /bin/sh -> /bin/bash, the resulting libtool will not work on systems
# where /bin/sh -> /bin/dash
- cd $(BUILDDIR) && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CONFFLAGS) CONFIG_SHELL=/bin/bash /bin/bash ../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-layout=Debian --includedir=\$${prefix}/usr/include/apr-1.0 --with-installbuilddir=\$${prefix}/usr/share/apr-1.0/build --enable-nonportable-atomics --enable-allocator-uses-mmap
+ cd $(BUILDDIR) && $(CONFFLAGS) CONFIG_SHELL=/bin/bash /bin/bash ../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-layout=Debian --includedir=\$${prefix}/usr/include/apr-1.0 --with-installbuilddir=\$${prefix}/usr/share/apr-1.0/build --enable-nonportable-atomics --enable-allocator-uses-mmap
# Determine whether upstream's configure gives the same definition of apr_ino_t as we had until 1.2.11-1
rm -f debian/ino_t_test
gcc -I$(CURDIR)/include -I$(BUILDDIR)/include `$(BUILDDIR)/apr-1-config --cppflags` -o debian/ino_t_test debian/ino_t_test.c
@@ -100,7 +100,7 @@
build-stamp: $(BUILDDIR)/config.status
dh_testdir
- $(MAKE) -C $(BUILDDIR) CFLAGS="$(H_CFLAGS)" LDFLAGS="$(H_LDFLAGS)"
+ $(MAKE) -C $(BUILDDIR) CFLAGS="$(H_CFLAGS) $(CFLAGS)" LDFLAGS="$(H_LDFLAGS) $(LDFLAGS)"
$(MAKE) -C $(BUILDDIR) dox
touch $@
@@ -125,7 +125,7 @@
test-stamp: build
dh_testdir
- $(MAKE) -C $(BUILDDIR)/test all CFLAGS="$(H_CFLAGS)" LDFLAGS="$(H_LDFLAGS)"
+ $(MAKE) -C $(BUILDDIR)/test all CFLAGS="$(H_CFLAGS) $(CFLAGS)" LDFLAGS="$(H_LDFLAGS) $(LDFLAGS)"
cd $(BUILDDIR)/test && ./testall -v testsockets testsock || $(IGNORE_TESTSOCK)
cd $(BUILDDIR)/test && ( ulimit -S -s 8192 ; ./testall -v testatomic)
cd $(BUILDDIR)/test && ./testall -v -x testsockets testsock testatomic
