On Fri, Feb 07, 2014 at 10:26:47AM +0100, Matthias Klose wrote: > Am 07.02.2014 09:14, schrieb Daniel Schepler: > > and also it allows building without > > multilib compilers and libraries which aren't available until much later in > > the bootstrapping process. > > this is wrong and not needed. there is no difference in build dependencies > when > building a non-multilib'd or a multilib'd compiler.
I concur with Matthias. Technically it is not needed to go non-multilib. However your sibling architecture may be broken and maybe you'd rather drop multilib than dive into your sibling arch bugs. This is also no bootstrap thingy, it applies to native builds as well. Therefore I am suggesting to use a nobiarch profile (in line with the build profile spec). Patch attached. Patch is being tested on https://jenkins.debian.net/view/rebootstrap/. Helmut
diff -Nru readline6-6.3/debian/changelog readline6-6.3/debian/changelog --- readline6-6.3/debian/changelog 2014-04-05 13:20:10.000000000 +0200 +++ readline6-6.3/debian/changelog 2014-05-04 14:48:55.000000000 +0200 @@ -1,3 +1,10 @@ +readline6 (6.3-6.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Support nobiarch build profile. (Closes: #737955) + + -- Helmut Grohne <[email protected]> Sun, 04 May 2014 14:47:47 +0200 + readline6 (6.3-6) unstable; urgency=medium * Really apply the patch to fix the display issue when a multiline diff -Nru readline6-6.3/debian/control readline6-6.3/debian/control --- readline6-6.3/debian/control 2014-03-03 08:43:55.000000000 +0100 +++ readline6-6.3/debian/control 2014-05-04 14:45:27.000000000 +0200 @@ -4,11 +4,11 @@ Maintainer: Matthias Klose <[email protected]> Standards-Version: 3.9.5 Build-Depends: debhelper (>= 8.1.3), - libtinfo-dev, lib32tinfo-dev [amd64 ppc64], + libtinfo-dev, lib32tinfo-dev [amd64 ppc64] <!profile.nobiarch>, libncursesw5-dev (>= 5.6), - lib32ncursesw5-dev [amd64 ppc64], lib64ncurses5-dev [i386 powerpc sparc s390], + lib32ncursesw5-dev [amd64 ppc64] <!profile.nobiarch>, lib64ncurses5-dev [i386 powerpc sparc s390] <!profile.nobiarch>, mawk | awk, texinfo, autotools-dev, - gcc-multilib [amd64 i386 kfreebsd-amd64 powerpc ppc64 s390 sparc] + gcc-multilib [amd64 i386 kfreebsd-amd64 powerpc ppc64 s390 sparc] <!profile.nobiarch> Package: libreadline6 Architecture: any @@ -30,6 +30,7 @@ Depends: readline-common, ${shlibs:Depends}, ${misc:Depends} Section: libs Priority: optional +Build-Profiles: !nobiarch Description: GNU readline and history libraries, run-time libraries (64-bit) The GNU readline library aids in the consistency of user interface across discrete programs that need to provide a command line @@ -96,6 +97,7 @@ Conflicts: lib64readline-dev, lib64readline-gplv2-dev Section: libdevel Priority: optional +Build-Profiles: !nobiarch Description: GNU readline and history libraries, development files (64-bit) The GNU readline library aids in the consistency of user interface across discrete programs that need to provide a command line @@ -139,6 +141,7 @@ Depends: readline-common, ${shlibs:Depends}, ${misc:Depends} Section: libs Priority: optional +Build-Profiles: !nobiarch Description: GNU readline and history libraries, run-time libraries (32-bit) The GNU readline library aids in the consistency of user interface across discrete programs that need to provide a command line @@ -154,6 +157,7 @@ Conflicts: lib32readline-dev, lib32readline-gplv2-dev Section: libdevel Priority: optional +Build-Profiles: !nobiarch Description: GNU readline and history libraries, development files (32-bit) The GNU readline library aids in the consistency of user interface across discrete programs that need to provide a command line diff -Nru readline6-6.3/debian/rules readline6-6.3/debian/rules --- readline6-6.3/debian/rules 2014-03-19 17:05:34.000000000 +0100 +++ readline6-6.3/debian/rules 2014-05-04 14:46:45.000000000 +0200 @@ -57,6 +57,11 @@ endif endif +ifneq ($(filter nobiarch,$(DEB_BUILD_PROFILES)),) +build32 = +build64 = +endif + CFLAGS := $(shell dpkg-buildflags --get CFLAGS) CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
