[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#533688: (discover_2.1.2-3/avr32): FTBFS: Outdated config.{sub,guess}



control: tags -1 patch
control: tags -1 pending

> that patch would be needed also on ppc64el.
> Anyone can have a look at it ?
> Thank you very much,
> 

I sponsored the attached debdiff in deferred/3, since the freeze is approaching, and even
a no-change rebuild of the current package makes the program segfault on startup,
I added a -O1 optimization level to "fix" it.

(I would have done an upload in deferred/10, but time is not permitting it I guess,
and a package that segfaults on binNMU is an RC bug I think, see #846364)

sorry

G.
diff -u discover-2.1.2/debian/rules discover-2.1.2/debian/rules
--- discover-2.1.2/debian/rules
+++ discover-2.1.2/debian/rules
@@ -23,12 +23,16 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
+include /usr/share/dpkg/architecture.mk
+
 VERSION=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
 ARCH=$(shell dpkg --print-architecture)
 
 # if $DEB_BUILD_OPTIONS *doesn't* contain "noopt"
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-OPTIMIZE:=-O2
+# -O2 seems to make the program segfault (See: #846364)
+# -O1 seems to work correctly
+OPTIMIZE:=-O1
 endif
 
 # Figure out where the kernel PCMCIA headers are, searching the
@@ -64,11 +68,16 @@
 		--with-default-url=file:///lib/discover/list.xml \
 		--disable-curl
 
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+RUN_CONFIGURE += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+
 configure: configure-deb
 
 configure-deb: configure-deb-stamp
 configure-deb-stamp:
 	dh_testdir
+	dh_autotools-dev_updateconfig
 
 	mkdir builddeb
 	cd builddeb && $(CFLAGS_DEB) $(RUN_CONFIGURE)
@@ -88,6 +97,7 @@
 clean:
 	dh_testdir
 	dh_testroot
+	dh_autotools-dev_restoreconfig
 
 	rm -rf builddeb build-deb-stamp configure-deb-stamp config.log config.status
 
diff -u discover-2.1.2/debian/changelog discover-2.1.2/debian/changelog
--- discover-2.1.2/debian/changelog
+++ discover-2.1.2/debian/changelog
@@ -1,3 +1,21 @@
+discover (2.1.2-7.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Gianfranco Costamagna ]
+  * Build with -O1, for some reasons even a no-change
+    rebuild of the existent code makes the program
+    segfault on startup
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: Pass --host to configure (Closes: #812667).
+
+  [ Logan Rosen ]
+  * Fix FTBFS on various archs: Use autotools-dev to update
+    config.guess and config.sub. (Closes: #533688)
+
+ -- Fernando Seiti Furusato <ferseiti@linux.vnet.ibm.com>  Wed, 30 Nov 2016 14:12:47 +0000
+
 discover (2.1.2-7) unstable; urgency=medium
 
   * Ack NMUs 2.1.2-5.1 and 2.1.2-5.2 and merge them into subversion.
diff -u discover-2.1.2/debian/control discover-2.1.2/debian/control
--- discover-2.1.2/debian/control
+++ discover-2.1.2/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
 Uploaders: David Nusinow <dnusinow@debian.org>, Gaudenz Steinlin <gaudenz@debian.org>, Petter Reinholdtsen <pere@debian.org>, Otavio Salvador <otavio@debian.org>
-Build-Depends: debhelper (>= 8), libexpat1-dev, po-debconf, libusb-dev
+Build-Depends: debhelper (>= 8), libexpat1-dev, po-debconf, libusb-dev, autotools-dev
 Standards-Version: 3.8.0
 
 Package: discover

Attachment: signature.asc
Description: OpenPGP digital signature


Reply to: