From e1c153d8416da00ff960e635f54a1742fa33fdb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sat, 17 Jul 2021 16:57:10 -0300 Subject: [PATCH] musl-bootstrap: only build for glibc. Some of this package's files conflict with the normal musl package, which would break a system if it's installed and then uninstalled, ending up without the dynamic linker. Furthermore, it's only useful for glibc, anyway. musl archs already have the normal musl package. Since we are here, lint package and remove outdated sed for when cc was still an alternative. --- srcpkgs/musl-bootstrap/template | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/srcpkgs/musl-bootstrap/template b/srcpkgs/musl-bootstrap/template index 6f0e1b1ef68..1d72d76c7a0 100644 --- a/srcpkgs/musl-bootstrap/template +++ b/srcpkgs/musl-bootstrap/template @@ -1,19 +1,20 @@ -# Template file for 'musl-bootstrap'. +# Template file for 'musl-bootstrap' pkgname=musl-bootstrap version=1.1.24 -revision=2 -lib32disabled=yes +revision=3 +archs="~*-musl" wrksrc="musl-${version}" build_style=configure configure_args="--prefix=/usr/lib/musl" make_build_args="ALL_TOOLS+=obj/musl-gcc ALL_TOOLS+=obj/musl-clang ALL_TOOLS+=obj/ld.musl-clang" make_install_args="$make_build_args" -short_desc="The musl C library (bootstrap pkg)" +short_desc="Musl C library (bootstrap package)" maintainer="Orphaned " license="MIT" homepage="http://www.musl-libc.org/" distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz" checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 +lib32disabled=yes case "$XBPS_TARGET_MACHINE" in ppc*) CFLAGS="-mlong-double-64";; @@ -22,8 +23,6 @@ esac post_install() { mv ${DESTDIR}/lib/* ${DESTDIR}/usr/lib/ vmkdir usr/bin - # cc is an alternative and might actually be clang - sed -i s/REALGCC:-cc/REALGCC:-gcc/ ${DESTDIR}/usr/lib/musl/bin/musl-gcc ln -sfr ${DESTDIR}/usr/lib/musl/bin/musl-gcc ${DESTDIR}/usr/bin/musl-gcc ln -sfr ${DESTDIR}/usr/lib/musl/bin/musl-clang ${DESTDIR}/usr/bin/musl-clang ln -sfr ${DESTDIR}/usr/lib/musl/bin/ld.musl-clang ${DESTDIR}/usr/bin/ld.musl-clang