Source: musl
Severity: minor
Tags: patch
Hello.
You may be interested in the two attached suggestions.
>From ef5ad943af24a412fa2049afdf2405a3a3becdd4 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <[email protected]>
Date: Sun, 14 Feb 2021 12:10:12 +0100
Subject: [PATCH 1/2] Replace dh-exec with Make recipes
The motivation is that dh-exec is orphaned (#851746).
MUSL_{ARCH,TRIPLE} are shown in the log instead of implicitly passed
via the environment.
Replace ../scripts path with the more explicit debian/scripts.
---
debian/control | 2 +-
debian/musl-dev.install | 4 ----
debian/musl-tools.install | 3 ---
debian/musl-tools.links | 2 --
debian/musl.install | 5 -----
debian/musl.links | 2 --
debian/rules | 19 ++++++++++++++++---
debian/source/lintian-overrides | 2 --
8 files changed, 17 insertions(+), 22 deletions(-)
delete mode 100755 debian/musl-dev.install
delete mode 100755 debian/musl-tools.install
delete mode 100755 debian/musl-tools.links
delete mode 100755 debian/musl.install
delete mode 100755 debian/musl.links
delete mode 100644 debian/source/lintian-overrides
diff --git a/debian/control b/debian/control
index 4b67bb3..d403081 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: musl
Section: libs
Priority: optional
Maintainer: Reiner Herrmann <[email protected]>
-Build-Depends: debhelper-compat (= 13), dh-exec
+Build-Depends: debhelper-compat (= 13),
Standards-Version: 4.5.1
Homepage: https://musl.libc.org/
Vcs-Git: https://salsa.debian.org/reiner/musl.git
diff --git a/debian/musl-dev.install b/debian/musl-dev.install
deleted file mode 100755
index 78736e1..0000000
--- a/debian/musl-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /usr/bin/dh-exec
-usr/lib/${MUSL_TRIPLE}/*.a
-usr/lib/${MUSL_TRIPLE}/*.o
-usr/include/${MUSL_TRIPLE}/*
diff --git a/debian/musl-tools.install b/debian/musl-tools.install
deleted file mode 100755
index 6c20dd1..0000000
--- a/debian/musl-tools.install
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /usr/bin/dh-exec
-usr/bin/*
-usr/lib/${MUSL_TRIPLE}/*.specs
diff --git a/debian/musl-tools.links b/debian/musl-tools.links
deleted file mode 100755
index 67cde40..0000000
--- a/debian/musl-tools.links
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /usr/bin/dh-exec
-/lib/${MUSL_TRIPLE}/libc.so /usr/bin/musl-ldd
diff --git a/debian/musl.install b/debian/musl.install
deleted file mode 100755
index 2bed4ab..0000000
--- a/debian/musl.install
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /usr/bin/dh-exec
-usr/lib/${MUSL_TRIPLE}/libc.so lib/${MUSL_TRIPLE}
-../scripts/ld-musl-config usr/bin
-../scripts/${MUSL_TRIPLE}.path etc/ld-musl-${MUSL_ARCH}.d
-../scripts/ld-musl-${MUSL_ARCH}.path etc
diff --git a/debian/musl.links b/debian/musl.links
deleted file mode 100755
index 94fa2f8..0000000
--- a/debian/musl.links
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /usr/bin/dh-exec
-/lib/${MUSL_TRIPLE}/libc.so /lib/ld-musl-${MUSL_ARCH}.so.1
diff --git a/debian/rules b/debian/rules
index c308bc6..2196662 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,9 +35,6 @@ ifneq (,$(findstring ppc64el,$(DEB_HOST_ARCH)))
export DEB_CFLAGS_MAINT_APPEND += -mlong-double-64
endif
-export MUSL_ARCH
-export MUSL_TRIPLE
-
# Cross build support
ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
CC ?= cc
@@ -68,6 +65,22 @@ debian/scripts/$(MUSL_TRIPLE).path: debian/scripts/config.path.in
override_dh_auto_configure: debian/scripts/$(MUSL_TRIPLE).path
dh_auto_configure -- --libdir=/usr/lib/$(MUSL_TRIPLE) --includedir=/usr/include/$(MUSL_TRIPLE) --host=$(DEB_HOST_GNU_TYPE) --enable-gcc-wrapper --enable-debug
+
+override_dh_install:
+ dh_install -pmusl-dev --autodest usr/lib/$(MUSL_TRIPLE)/*.a \
+ usr/lib/$(MUSL_TRIPLE)/*.o \
+ usr/include/$(MUSL_TRIPLE)/*
+ dh_install -pmusl-tools --autodest usr/bin/* \
+ usr/lib/$(MUSL_TRIPLE)/*.specs
+ dh_install -pmusl usr/lib/$(MUSL_TRIPLE)/libc.so lib/$(MUSL_TRIPLE)
+ dh_install -pmusl debian/scripts/ld-musl-config usr/bin
+ dh_install -pmusl debian/scripts/$(MUSL_TRIPLE).path etc/ld-musl-$(MUSL_ARCH).d
+ dh_install -pmusl debian/scripts/ld-musl-$(MUSL_ARCH).path etc
+
+override_dh_link:
+ dh_link -pmusl-tools lib/$(MUSL_TRIPLE)/libc.so usr/bin/musl-ldd
+ dh_link -pmusl lib/$(MUSL_TRIPLE)/libc.so lib/ld-musl-$(MUSL_ARCH).so.1
+
override_dh_fixperms:
dh_fixperms --exclude libc.so
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
deleted file mode 100644
index 1098b36..0000000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# MUSL_ARCH and MUSL_TRIPLE are used to define install directory
-musl source: dh-exec-subst-unknown-variable
--
2.30.0
>From bc7a98f3608ab9dcc7022072c26da73f2218be62 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <[email protected]>
Date: Sun, 14 Feb 2021 12:58:19 +0100
Subject: [PATCH 2/2] Clean generated debian/*.path
Some are, probably unwantedly, embedded into 1.2.2-1 source package.
---
debian/rules | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/rules b/debian/rules
index 2196662..3b23ecd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,8 +88,10 @@ override_dh_gencontrol:
dh_gencontrol -- $(GENCTRL_OPTIONS)
override_dh_clean:
- rm -f debian/musl-dev.postinst debian/musl-dev.postrm
- dh_clean
+ dh_clean debian/musl-dev.postinst \
+ debian/musl-dev.postrm \
+ debian/scripts/$(MUSL_TRIPLE).path \
+ debian/scripts/ld-musl-$(MUSL_ARCH).path
override_dh_installdeb:
sed 's/@MUSL_TRIPLE@/$(MUSL_TRIPLE)/g' \
--
2.30.0
