tag 654257 + patch thanks On Mon, 02 Jan 2012 16:47:33 +0100, Jakub Wilk wrote:
> Source: newlib > Version: 1.18.0-6.1 > Severity: serious > Justification: fails to build from source The attached patch (taken from Ubuntu) fixes the FTBFS, but then we run into: % lintian -F newlib_1.18.0-6.2_i386.changes E: newlib-m68hc1x: arch-independent-package-contains-binary-or-object usr/m68hc11/lib/libc.a Not sure if a lintian override is ok here ... Cheers, gregor -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Rod Steward: Tonight's The Night
diff -u newlib-1.18.0/debian/control newlib-1.18.0/debian/control --- newlib-1.18.0/debian/control +++ newlib-1.18.0/debian/control @@ -2,7 +2,7 @@ Section: devel Priority: extra Maintainer: Arthur Loiret <aloi...@debian.org> -Build-Depends: debhelper (>= 6), quilt (>= 0.40), texinfo, binutils-spu [powerpc ppc64], gcc-spu [powerpc ppc64], lzma +Build-Depends: debhelper (>= 6), quilt (>= 0.40), texinfo, binutils-spu [powerpc ppc64], gcc-spu [powerpc ppc64], lzma, dpkg-dev (>= 1.16.0), linux-libc-dev (>= 3.0.0-2) Build-Depends-Indep: gcc-m68hc1x Standards-Version: 3.9.1 diff -u newlib-1.18.0/debian/changelog newlib-1.18.0/debian/changelog --- newlib-1.18.0/debian/changelog +++ newlib-1.18.0/debian/changelog @@ -1,3 +1,19 @@ +newlib (1.18.0-6.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: cannot find the library `sys/linux/liblinux.la' or + unhandled argument `sys/linux/liblinux.la'": add patch from Ubuntu: + [ Wookey ] + * Fix build to work with co-installable (multiarched) linux-libc-dev + headers. LP: #750585. + [ Steve Langasek ] + * add a versioned build-dependency on linux-libc-dev and dpkg-dev for the + hard-coded multiarch paths. + (And adjust versions for linux-libc-dev and dpkg-dev.) + (Closes: #654257) + + -- gregor herrmann <gre...@debian.org> Sun, 22 Jan 2012 15:37:13 +0100 + newlib (1.18.0-6.1) unstable; urgency=medium * Non-maintainer upload. diff -u newlib-1.18.0/debian/rules newlib-1.18.0/debian/rules --- newlib-1.18.0/debian/rules +++ newlib-1.18.0/debian/rules @@ -3,6 +3,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) version := $(shell dpkg-parsechangelog | grep ^Version | sed -e 's/^Version: //') uversion := $(shell echo $(version) | cut -d '-' -f1) diff -u newlib-1.18.0/debian/patches/series newlib-1.18.0/debian/patches/series --- newlib-1.18.0/debian/patches/series +++ newlib-1.18.0/debian/patches/series @@ -3,0 +4 @@ +65_multiarch-headers.patch only in patch2: unchanged: --- newlib-1.18.0.orig/debian/patches/65_multiarch-headers.patch +++ newlib-1.18.0/debian/patches/65_multiarch-headers.patch @@ -0,0 +1,26 @@ +Index: newlib-1.18.0/newlib/libc/sys/linux/Makefile.am +=================================================================== +--- newlib-1.18.0.orig/newlib/libc/sys/linux/Makefile.am 2011-04-07 12:39:43.000000000 +0000 ++++ newlib-1.18.0/newlib/libc/sys/linux/Makefile.am 2011-04-07 12:39:47.000000000 +0000 +@@ -169,7 +169,7 @@ + + # This will handle both /usr/src/linux-2.4/include/asm/signal.h (in Red Hat Linux 7.1) + # and also /usr/src/linux/include/asm/signal.h in older versions of Red Hat Linux +-SIGNAL_H = /usr/include/asm/signal.h ++SIGNAL_H = /usr/include/$(DEB_HOST_MULTIARCH)/asm/signal.h + + liblinux_la_LDFLAGS = -Xcompiler -nostdlib + +Index: newlib-1.18.0/newlib/libc/sys/linux/Makefile.in +=================================================================== +--- newlib-1.18.0.orig/newlib/libc/sys/linux/Makefile.in 2011-04-07 12:57:39.000000000 +0000 ++++ newlib-1.18.0/newlib/libc/sys/linux/Makefile.in 2011-04-07 12:57:07.000000000 +0000 +@@ -484,7 +484,7 @@ + + # This will handle both /usr/src/linux-2.4/include/asm/signal.h (in Red Hat Linux 7.1) + # and also /usr/src/linux/include/asm/signal.h in older versions of Red Hat Linux +-SIGNAL_H = /usr/include/asm/signal.h ++SIGNAL_H = /usr/include/$(DEB_HOST_MULTIARCH)/asm/signal.h + liblinux_la_LDFLAGS = -Xcompiler -nostdlib + ADD_OBJS = \ + $(LINUX_MACH_LIB)
signature.asc
Description: Digital signature
