reassign 766812 musl-dev found 766812 1.1.5-1 tag 766812 patch thanks On Mar 31, Kevin Bortis <p...@bortis.ch> wrote:
> The link is needed for various tools that expect a link or the real > libc.so be available in the same location as the includes and other > resources. One prominent member is musl-gcc from the musl-tools > package, which would fail to dynamic link to the correct libc.so. Looks like I missed your reply. The attached patch solves this problem by creating the link in postinst and only if it is needed. For more information about merged /usr please read http://anonscm.debian.org/cgit/users/md/usrmerge.git/tree/debian/README.Debian -- ciao, Marco
diff -urNp musl-1.1.9/debian/musl-dev.links musl-1.1.9+nmu1/debian/musl-dev.links
--- musl-1.1.9/debian/musl-dev.links 2015-04-01 07:13:51.000000000 +0200
+++ musl-1.1.9+nmu1/debian/musl-dev.links 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-#! /usr/bin/dh-exec
-/lib/${MUSL_TRIPLE}/libc.so /usr/lib/${MUSL_TRIPLE}/libc.so
diff -urNp musl-1.1.9/debian/musl-dev.postinst.in musl-1.1.9+nmu1/debian/musl-dev.postinst.in
--- musl-1.1.9/debian/musl-dev.postinst.in 1970-01-01 01:00:00.000000000 +0100
+++ musl-1.1.9+nmu1/debian/musl-dev.postinst.in 2016-01-04 06:54:39.707459093 +0100
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+if [ "$1" = 'configure' -a ! -e /usr/lib/@MUSL_TRIPLE@/libc.so ]; then
+ ln -s /lib/@MUSL_TRIPLE@/libc.so /usr/lib/@MUSL_TRIPLE@/libc.so
+fi
+
+#DEBHELPER#
+
diff -urNp musl-1.1.9/debian/musl-dev.postrm.in musl-1.1.9+nmu1/debian/musl-dev.postrm.in
--- musl-1.1.9/debian/musl-dev.postrm.in 1970-01-01 01:00:00.000000000 +0100
+++ musl-1.1.9+nmu1/debian/musl-dev.postrm.in 2016-01-04 07:02:03.145325138 +0100
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+if [ "$1" = 'remove' -a -L /usr/lib/@MUSL_TRIPLE@/libc.so ]; then
+ rm /usr/lib/@MUSL_TRIPLE@/libc.so
+fi
+
+#DEBHELPER#
+
diff -urNp musl-1.1.9/debian/rules musl-1.1.9+nmu1/debian/rules
--- musl-1.1.9/debian/rules 2015-05-14 09:16:57.000000000 +0200
+++ musl-1.1.9+nmu1/debian/rules 2016-01-04 07:05:07.239711327 +0100
@@ -69,3 +69,15 @@ override_dh_fixperms:
override_dh_gencontrol:
dh_gencontrol -- $(GENCTRL_OPTIONS)
+
+override_dh_clean:
+ rm -f debian/musl-dev.postinst debian/musl-dev.postrm
+ dh_clean
+
+override_dh_installdeb:
+ sed 's/@MUSL_TRIPLE@/$(MUSL_TRIPLE)/g' \
+ debian/musl-dev.postinst.in > debian/musl-dev.postinst
+ sed 's/@MUSL_TRIPLE@/$(MUSL_TRIPLE)/g' \
+ debian/musl-dev.postrm.in > debian/musl-dev.postrm
+ dh_installdeb
+
signature.asc
Description: PGP signature
