tags 672094 + patch pending thanks
add patch, uploaded to delayed/5
diff -Nru protobuf-2.4.1/debian/changelog protobuf-2.4.1/debian/changelog --- protobuf-2.4.1/debian/changelog 2011-11-07 23:04:14.000000000 +0000 +++ protobuf-2.4.1/debian/changelog 2012-05-21 01:43:15.000000000 +0000 @@ -1,3 +1,10 @@ +protobuf (2.4.1-1.1) unstable; urgency=low + + * Non maintainer upload + * Work around build failure with GCC 4.7. Closes: #672094. + + -- Matthias Klose <[email protected]> Mon, 21 May 2012 01:37:11 +0000 + protobuf (2.4.1-1) unstable; urgency=low [ Thomas Koch ] diff -Nru protobuf-2.4.1/debian/rules protobuf-2.4.1/debian/rules --- protobuf-2.4.1/debian/rules 2011-11-07 23:04:14.000000000 +0000 +++ protobuf-2.4.1/debian/rules 2012-05-21 01:42:09.000000000 +0000 @@ -16,15 +16,8 @@ # This has to be exported to make some magic below work. export DH_OPTIONS -# DEB_BUILD_OPTIONS handling - is this really needed since dpkg-dev 1.14.17? -# note that the strip option is handled directly by dh_strip -CFLAGS = -Wall -g - -ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif +CFLAGS ?= $(shell dpkg-buildflags --get CFLAGS) -Wall +CXXFLAGS ?= $(shell dpkg-buildflags --get CXXFLAGS) -Wall -fpermissive # Renesas SH(sh4) need -mieee option. # If this option is not effective, NaN test failed. @@ -48,7 +41,7 @@ configure-stamp: dh_testdir # Add here commands to configure the package. - dh_auto_configure + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" dh_auto_configure touch configure-stamp
