Control: tags -1 + pending
Hi Matthias,
On Mon, Sep 06, 2021 at 07:56:36AM +0200, Helmut Grohne wrote:
> In 2014, I sent a patch to add a nobiarch build profile to readline. It
> is unfortunate that you failed to reply thus far. Do you object to me
> NMUing the patch? It still applies and it still solves a practical
> problem (bootstrapping when your sibling architecture is broken).
Since there was no objection within a year, I went ahead.
Helmut
diff --minimal -Nru readline-8.2/debian/changelog readline-8.2/debian/changelog
--- readline-8.2/debian/changelog 2022-10-15 13:47:17.0 +0200
+++ readline-8.2/debian/changelog 2022-11-11 07:26:30.0 +0100
@@ -1,3 +1,10 @@
+readline (8.2-1.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Support nobiarch build profile. (Closes: #737955)
+
+ -- Helmut Grohne Fri, 11 Nov 2022 07:26:30 +0100
+
readline (8.2-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff --minimal -Nru readline-8.2/debian/control readline-8.2/debian/control
--- readline-8.2/debian/control 2022-08-24 10:43:45.0 +0200
+++ readline-8.2/debian/control 2022-11-11 07:26:30.0 +0100
@@ -5,9 +5,9 @@
Standards-Version: 4.6.1
Build-Depends: debhelper (>= 11),
libncurses-dev,
- lib32ncurses-dev [amd64 ppc64], lib64ncurses-dev [i386 powerpc sparc s390],
+ lib32ncurses-dev [amd64 ppc64] , lib64ncurses-dev [i386 powerpc
sparc s390] ,
mawk | awk, texinfo,
- gcc-multilib [amd64 i386 kfreebsd-amd64 powerpc ppc64 s390 sparc]
+ gcc-multilib [amd64 i386 kfreebsd-amd64 powerpc ppc64 s390 sparc]
Package: libreadline8
Architecture: any
@@ -41,6 +41,7 @@
Package: lib64readline8
Architecture: i386 powerpc s390 sparc
Depends: readline-common, ${shlibs:Depends}, ${misc:Depends}
+Build-Profiles:
Section: libs
Description: GNU readline and history libraries, run-time libraries (64-bit)
The GNU readline library aids in the consistency of user interface
@@ -103,6 +104,7 @@
Depends: lib64readline8 (= ${binary:Version}), lib64ncurses-dev,
${devxx:Depends}, ${misc:Depends}
Conflicts: lib64readline6-dev, lib64readline-gplv2-dev
Provides: lib64readline6-dev
+Build-Profiles:
Section: libdevel
Description: GNU readline and history libraries, development files (64-bit)
The GNU readline library aids in the consistency of user interface
@@ -129,6 +131,7 @@
Package: lib32readline8
Architecture: amd64 ppc64
Depends: readline-common, ${shlibs:Depends}, ${misc:Depends}
+Build-Profiles:
Section: libs
Description: GNU readline and history libraries, run-time libraries (32-bit)
The GNU readline library aids in the consistency of user interface
@@ -143,6 +146,7 @@
Depends: lib32readline8 (= ${binary:Version}), lib32ncurses-dev,
${devxx:Depends}, ${misc:Depends}
Conflicts: lib32readline6-dev, lib32readline-gplv2-dev
Provides: lib32readline6-dev
+Build-Profiles:
Section: libdevel
Description: GNU readline and history libraries, development files (32-bit)
The GNU readline library aids in the consistency of user interface
diff --minimal -Nru readline-8.2/debian/rules readline-8.2/debian/rules
--- readline-8.2/debian/rules 2022-06-01 11:56:29.0 +0200
+++ readline-8.2/debian/rules 2022-11-11 07:26:09.0 +0100
@@ -63,6 +63,11 @@
unexport CPPFLAGS CFLAGS LDFLAGS
+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)
