On 29.05.2012 00:41, Jakub Wilk wrote:
> * Matthias Klose <[email protected]>, 2012-05-28, 22:19:
>> worked around the build failure, uploaded to delayed/5,
>
> Please post the NMU diff to the BTS. Thanks.
diff -u xorp-1.8.5/debian/rules xorp-1.8.5/debian/rules
--- xorp-1.8.5/debian/rules
+++ xorp-1.8.5/debian/rules
@@ -33,6 +33,8 @@
disable_fw=true \
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS='-Wl,-z,defs'
+SCONSFLAGS += CC=gcc-4.6 CXX=g++-4.6
+
CFLAGS = -Wall -g
GXXVERSION = $(shell g++ --version | head -1 | cut -f 4 -d ' ' | cut -b 1-3)
#ifeq ($(GXXVERSION),4.6)
diff -u xorp-1.8.5/debian/control xorp-1.8.5/debian/control
--- xorp-1.8.5/debian/control
+++ xorp-1.8.5/debian/control
@@ -4,6 +4,7 @@
Maintainer: Jose Calhariz <[email protected]>
Uploaders: Javier Fernandez-Sanguino Pen~a <[email protected]>
Build-Depends: debhelper (>= 7),
+ g++-4.6,
scons, libboost-dev,
autotools-dev, quilt, libssl-dev,
libncurses5-dev | ncurses-dev, docbook-to-man, libpcap0.8-dev,
diff -u xorp-1.8.5/debian/changelog xorp-1.8.5/debian/changelog
--- xorp-1.8.5/debian/changelog
+++ xorp-1.8.5/debian/changelog
@@ -1,3 +1,10 @@
+xorp (1.8.5-1.1) unstable; urgency=low
+
+ * Non maintainer upload
+ * Work around build failure with GCC 4.7. Closes: #667423.
+
+ -- Matthias Klose <[email protected]> Mon, 28 May 2012 13:44:30 +0000
+
xorp (1.8.5-1) unstable; urgency=low
* New upstream release
