diff options
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/musl/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-libs/musl/files/ldconfig.in | 144 | ||||
| -rw-r--r-- | sys-libs/musl/musl-1.1.9.ebuild | 126 | ||||
| -rw-r--r-- | sys-libs/musl/musl-9999.ebuild | 28 |
4 files changed, 302 insertions, 4 deletions
diff --git a/sys-libs/musl/ChangeLog b/sys-libs/musl/ChangeLog index da91b777c2dd..9b9adc0f49f5 100644 --- a/sys-libs/musl/ChangeLog +++ b/sys-libs/musl/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/musl # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v 1.54 2015/05/13 12:51:20 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v 1.55 2015/05/13 14:49:02 blueness Exp $ + +*musl-1.1.9 (13 May 2015) + + 13 May 2015; Anthony G. Basile <blueness@gentoo.org> +files/ldconfig.in, + +musl-1.1.9.ebuild, musl-9999.ebuild: + Version bump. Addresses bug #544128. 13 May 2015; Anthony G. Basile <blueness@gentoo.org> musl-1.1.8-r2.ebuild: Stable for amd64, arm, ppc and x86. diff --git a/sys-libs/musl/files/ldconfig.in b/sys-libs/musl/files/ldconfig.in new file mode 100644 index 000000000000..a2921903c32c --- /dev/null +++ b/sys-libs/musl/files/ldconfig.in @@ -0,0 +1,144 @@ +#!/bin/bash -e +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +ROOT="/" + +LDSO_CONF="/etc/ld.so.conf" +if [[ ! -e $LDSO_CONF ]]; then + echo "$LDSO_CONF not found" >&2 + exit 1 +fi + +LDSO_CONF_DIR=$(dirname $LDSO_CONF) + +VERBOSE=0 + +UPDATE_LINKS=1 + +get_options() { + while getopts "vnNXf:C:r:p" opt "$@"; do + case $opt in + v) + echo "ldconfig for musl in Gentoo" + VERBOSE=1 + ;; + r) + ROOT=$OPTARG + ;; + f) + LDSO_CONF=$OPTARG + ;; + X) + UPDATE_LINKS=0 + ;; + \?) + echo "Invalid option: -$opt" >&2 + exit 1 + ;; + n|N|C|p) + echo "Unimplemented option: -$opt" >&2 + exit 1 + ;; + esac + done + + if [[ $UPDATE_LINKS == 1 ]]; then + echo "Updating links is not implemented." + fi +} + + +repeated() { + local l=$1 + local drs="${@:2}" + for m in $drs; do + [[ $m == $l ]] && return 0 + done + return 1 +} + +expand() { + # We are assuming the ld.so.conf's 'include' is not recursive + local f line l + local glob="$LDSO_CONF_DIR/$1" + local drs="${@:2} " + + for f in $glob; do + [[ ! -f $f ]] && continue + while read line; do + line=${line%%#*} + line=${line//:/ } + line=${line//,/ } + for l in $line; do + #We must add this whether or not the directory exists + repeated $l $drs && continue + drs+=" $l " + done + done < $f + done + + echo $drs +} + +read_ldso_conf() { + local drs=" " + + while read line; do + # Sanitize the line - see ldconfig(8) for delimiters + # Note: bash read turns tabs into spaces and read already + # delimits on newlines with the default $IFS + line=${line%%#*} # Remove comments + line=${line//:/ } # Change colon delimiter to space + line=${line//,/ } # Change comma delimiter to space + + next=0 + for l in $line; do + if [[ $next == 1 ]]; then + next=0 + drs=$(expand $l $drs) + elif [[ $l == "include" ]]; then + next=1 + else + # glibc's ldconfig silently skips non directories + if [[ -d $l ]]; then + repeated $l $drs && continue + drs+=" $l " + fi + fi + done + done < $1 + + echo $drs +} + +sanitize() { + local drs=$@ + + repeated "/lib" $drs || drs="/lib $drs" + repeated "/usr/lib" $drs || drs="/usr/lib $drs" + + echo $drs +} + +get_options "$@" +drs=$(read_ldso_conf "$LDSO_CONF") +drs=$(sanitize $drs) + +ARCH=@@ARCH@@ +LDSO_PATH="/lib/ld-musl-${ARCH}.so.1" +if [[ ! -e $LDSO_PATH ]]; then + echo "$LDSO_PATH not found" >&2 + exit 1 +fi + +LDSO_ARCH=$(basename $LDSO_PATH) +LDSO_NAME=${LDSO_ARCH%.so.1} +ETC_LDSO_PATH=/etc/${LDSO_NAME}.path + +X=$(mktemp --tmpdir=/tmp ${LDSO_NAME}.XXXXXX) +for d in $drs; do + echo $d >> $X +done +chmod 644 $X +mv $X $ETC_LDSO_PATH diff --git a/sys-libs/musl/musl-1.1.9.ebuild b/sys-libs/musl/musl-1.1.9.ebuild new file mode 100644 index 000000000000..eec3cc4f0ba9 --- /dev/null +++ b/sys-libs/musl/musl-1.1.9.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-1.1.9.ebuild,v 1.1 2015/05/13 14:49:02 blueness Exp $ + +EAPI=5 + +inherit eutils flag-o-matic multilib toolchain-funcs +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.musl-libc.org/musl" + inherit git-2 +fi + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi + +DESCRIPTION="Lightweight, fast and simple C library focused on standards-conformance and safety" +HOMEPAGE="http://www.musl-libc.org/" +if [[ ${PV} != "9999" ]] ; then + PATCH_VER="" + SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz" + KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86" +fi + +LICENSE="MIT LGPL-2 GPL-2" +SLOT="0" +IUSE="crosscompile_opts_headers-only" + +RDEPEND="!sys-apps/getent" + +is_crosscompile() { + [[ ${CHOST} != ${CTARGET} ]] +} + +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 + $(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 + *-musl*) ;; + *) die "Use sys-devel/crossdev to build a musl toolchain" ;; + esac + fi + + epatch_user +} + +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 +} + +src_compile() { + emake include/bits/alltypes.h || die + just_headers && return 0 + + emake || die +} + +src_install() { + local target="install" + just_headers && target="install-headers" + emake DESTDIR="${D}" ${target} || die + 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 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 + cp "${FILESDIR}"/ldconfig.in "${T}" + sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig + into / + dosbin "${T}"/ldconfig + into /usr + dobin "${FILESDIR}"/getent + echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl + doenvd "${T}"/00musl || die + fi +} + +pkg_postinst() { + is_crosscompile && return 0 + + [ "${ROOT}" != "/" ] && return 0 + + ldconfig + # 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 a53ab97b3f32..e771177bc316 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-9999.ebuild,v 1.19 2015/04/18 11:24:34 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-9999.ebuild,v 1.20 2015/05/13 14:49:02 blueness Exp $ EAPI=5 @@ -40,6 +40,17 @@ 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 + $(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 @@ -84,10 +95,21 @@ src_install() { dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd if [[ ${CATEGORY} != cross-* ]] ; then + 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 + cp "${FILESDIR}"/ldconfig.in "${T}" + sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig + into / + dosbin "${T}"/ldconfig into /usr dobin "${FILESDIR}"/getent - into / - dosbin "${FILESDIR}"/ldconfig echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl doenvd "${T}"/00musl || die fi |