sys-libs/musl: revbump to improve the ldconfig script

Also add some more "|| die".

Gentoo-Bug: https://bugs.gentoo.org/592268

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

diff --git a/sys-libs/musl/musl-1.1.15-r1.ebuild b/sys-libs/musl/musl-1.1.15-r1.ebuild
new file mode 100644 (file)
index 0000000..ae82136
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.15-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
+       EGIT_REPO_URI="git://git.musl-libc.org/musl"
+       inherit git-r3
+       SRC_URI="
+       http://dev.gentoo.org/~blueness/musl-misc/getconf.c
+       http://dev.gentoo.org/~blueness/musl-misc/getent.c
+       http://dev.gentoo.org/~blueness/musl-misc/iconv.c"
+       KEYWORDS=""
+else
+       SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
+       http://dev.gentoo.org/~blueness/musl-misc/getconf.c
+       http://dev.gentoo.org/~blueness/musl-misc/getent.c
+       http://dev.gentoo.org/~blueness/musl-misc/iconv.c"
+       KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86"
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+       if [[ ${CATEGORY} == cross-* ]] ; then
+               export CTARGET=${CATEGORY#cross-}
+       fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="crosscompile_opts_headers-only"
+
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
+is_crosscompile() {
+       [[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+       use crosscompile_opts_headers-only && is_crosscompile
+}
+
+pkg_setup() {
+       if [ ${CTARGET} == ${CHOST} ] ; then
+               case ${CHOST} in
+               *-musl*) ;;
+               *) die "Use sys-devel/crossdev to build a musl toolchain" ;;
+               esac
+       fi
+}
+
+src_configure() {
+       tc-getCC ${CTARGET}
+       just_headers && export CC=true
+
+       local sysroot
+       is_crosscompile && sysroot=/usr/${CTARGET}
+       ./configure \
+               --target=${CTARGET} \
+               --prefix=${sysroot}/usr \
+               --syslibdir=${sysroot}/lib \
+               --disable-gcc-wrapper || die
+}
+
+src_compile() {
+       emake obj/include/bits/alltypes.h
+       just_headers && return 0
+
+       emake
+       $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die
+       $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die
+       $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die
+}
+
+src_install() {
+       local target="install"
+       just_headers && target="install-headers"
+       emake DESTDIR="${D}" ${target}
+       just_headers && return 0
+
+       # musl provides ldd via a sym link to its ld.so
+       local sysroot
+       is_crosscompile && sysroot=/usr/${CTARGET}
+       local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
+       dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
+
+       if [[ ${CATEGORY} != cross-* ]] ; then
+               local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+               cp "${FILESDIR}"/ldconfig.in "${T}" || die
+               sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+               into /
+               dosbin "${T}"/ldconfig
+               into /usr
+               dobin "${T}"/getconf
+               dobin "${T}"/getent
+               dobin "${T}"/iconv
+               echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+               doenvd "${T}"/00musl || die
+       fi
+}
+
+pkg_postinst() {
+       is_crosscompile && return 0
+
+       [ "${ROOT}" != "/" ] && return 0
+
+       ldconfig || die
+       # reload init ...
+       /sbin/telinit U 2>/dev/null
+}

diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 906de18fb415f73fd0abfb367dd0b3c05204246f..ae821369ecc3029e8d45aea26aa4e5a00bda0bac 100644 (file)
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -46,17 +46,6 @@ just_headers() {
        use crosscompile_opts_headers-only && is_crosscompile
 }
 
-musl_endian() {
-       # XXX: this wont work for bi-endian, but we dont have any
-       touch "${T}"/endian.s || die
-       $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-       case $(file "${T}"/endian.o) in
-               *" MSB "*) echo "";;
-               *" LSB "*) echo "el";;
-               *)         echo "nfc";; # We shouldn't be here
-       esac
-}
-
 pkg_setup() {
        if [ ${CTARGET} == ${CHOST} ] ; then
                case ${CHOST} in
@@ -76,7 +65,7 @@ src_configure() {
                --target=${CTARGET} \
                --prefix=${sysroot}/usr \
                --syslibdir=${sysroot}/lib \
-               --disable-gcc-wrapper
+               --disable-gcc-wrapper || die
 }
 
 src_compile() {
@@ -84,9 +73,9 @@ src_compile() {
        just_headers && return 0
 
        emake
-       $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf
-       $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent
-       $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv
+       $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die
+       $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die
+       $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die
 }
 
 src_install() {
@@ -102,17 +91,7 @@ src_install() {
        dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
 
        if [[ ${CATEGORY} != cross-* ]] ; then
-               # TODO: We may be able to simplify this code by obtianing the arch name with
-               # /usr/lib/libc.so 2>&1 | sed -n 's/^.*(\(.*\))$/\1/;1p'
-               local target=$(tc-arch) arch
-               local endian=$(musl_endian)
-               case ${target} in
-                       amd64) arch="x86_64";;
-                       arm)   arch="armhf";; # We only have hardfloat right now
-                       mips)  arch="mips${endian}";;
-                       ppc)   arch="powerpc";;
-                       x86)   arch="i386";;
-               esac
+               local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
                cp "${FILESDIR}"/ldconfig.in "${T}" || die
                sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
                into /
@@ -131,7 +110,7 @@ pkg_postinst() {
 
        [ "${ROOT}" != "/" ] && return 0
 
-       ldconfig
+       ldconfig || die
        # reload init ...
        /sbin/telinit U 2>/dev/null
 }