Package: build-essential
Version: 12.9
Tags: patch

As part of the whole "for-host" thingy, we need to make build-essential
"Multi-Arch: same". Doing so is presently impossible as its
essential-package-list varies per architecture on a fixed filename.
Attempting to coinstall it would result in an unpack error.

To resolve this part, I propose encoding the architecture name into the
filename. I've checked for users of this file and found none, so the
move should be harmless. Please consider applying the attached patch.

Helmut
diff --minimal -Nru build-essential-12.9/Makefile.am 
build-essential-12.9+nmu1/Makefile.am
--- build-essential-12.9/Makefile.am    2005-07-07 20:27:17.000000000 +0200
+++ build-essential-12.9+nmu1/Makefile.am       2021-06-11 12:30:48.000000000 
+0200
@@ -4,7 +4,7 @@
 
 pkgdata_DATA = \
        list \
-       essential-packages-list
+       essential-packages-list-@DEB_HOST_ARCH@
 
 EXTRA_DIST = \
        list
@@ -12,11 +12,5 @@
        make-esslist.sh \
        essential-packages-list-*
 
-essential-packages-list: essential-packages-list-@DEB_HOST_ARCH@
-       ln -s $< $@
-
 essential-packages-list-@DEB_HOST_ARCH@:
        echo "No essential packages list is available" > $@
-
-clean-local:
-       rm -f essential-packages-list
diff --minimal -Nru build-essential-12.9/debian/changelog 
build-essential-12.9+nmu1/debian/changelog
--- build-essential-12.9/debian/changelog       2021-01-03 11:23:06.000000000 
+0100
+++ build-essential-12.9+nmu1/debian/changelog  2021-06-11 12:30:53.000000000 
+0200
@@ -1,3 +1,10 @@
+build-essential (12.9+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Prepare for making build-essential coinstallable. (Closes: #-1)
+
+ -- Helmut Grohne <[email protected]>  Fri, 11 Jun 2021 12:30:53 +0200
+
 build-essential (12.9) unstable; urgency=medium
 
   * Bump dependencies on gcc and g++ to 10.2.
diff --minimal -Nru build-essential-12.9/debian/rules 
build-essential-12.9+nmu1/debian/rules
--- build-essential-12.9/debian/rules   2021-01-03 11:23:06.000000000 +0100
+++ build-essential-12.9+nmu1/debian/rules      2021-06-11 12:30:53.000000000 
+0200
@@ -31,6 +31,7 @@
 
 configure-stamp:
        dh_testdir
+       dh_autoreconf
        ./configure --prefix=/usr
        touch configure-stamp
 
@@ -61,6 +62,7 @@
        done
        rm -f essential-packages-list
        dh_clean
+       dh_autoreconf_clean
 
 # Make it as clean as svn can make it.
 svnclean: clean
@@ -80,7 +82,7 @@
 
        mkdir -p debian/build-essential/usr/share/doc/build-essential
        ln -sf  ../../build-essential/list \
-               ../../build-essential/essential-packages-list \
+               ../../build-essential/essential-packages-list-$(DEB_HOST_ARCH) \
                debian/build-essential/usr/share/doc/build-essential
 endif
 

Reply via email to