From d9bd784cd06e4b20f634293adfa443ebcd1c0b90 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 21 Apr 2015 10:55:20 +0200 Subject: [PATCH] musl: remove broken ldconfig; needs pax-utils (scanelf). --- srcpkgs/musl/files/ldconfig | 18 ------------------ srcpkgs/musl/template | 3 +-- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 srcpkgs/musl/files/ldconfig diff --git a/srcpkgs/musl/files/ldconfig b/srcpkgs/musl/files/ldconfig deleted file mode 100644 index ccf7c2aa4d..0000000000 --- a/srcpkgs/musl/files/ldconfig +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -scan_dirs() { - scanelf -qS "$@" | while read SONAME FILE; do - TARGET="${FILE##*/}" - LINK="${FILE%/*}/$SONAME" - case "$FILE" in - /lib/*|/usr/lib/*|/usr/local/lib/*) ;; - *) [ -h "$LINK" -o ! -e "$LINK" ] && ln -sf "$TARGET" "$LINK" - esac - done - return 0 -} -# eat ldconfig options -while getopts "nNvXvf:C:r:" opt; do - : -done -shift $(( $OPTIND - 1 )) -[ $# -gt 0 ] && scan_dirs "$@" diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template index 122f354312..3127b54b1b 100644 --- a/srcpkgs/musl/template +++ b/srcpkgs/musl/template @@ -1,7 +1,7 @@ # Template file for 'musl'. pkgname=musl version=1.1.8 -revision=1 +revision=2 build_style=gnu-configure configure_args="--prefix=/usr --disable-gcc-wrapper" conflicts="glibc>=0" @@ -34,7 +34,6 @@ do_install() { vman ${FILESDIR}/getent.1 vbin getconf vman ${FILESDIR}/getconf.1 - vbin ${FILESDIR}/ldconfig # Create xbps.d(5) arch override file vmkdir usr/share/xbps.d echo "architecture=${XBPS_TARGET_MACHINE}" > ${DESTDIR}/usr/share/xbps.d/musl-arch.conf