commit: a29ce157c5883b69068f53c53be5a263841d3c48
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 15 13:33:11 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Jul 15 13:33:11 2015 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=a29ce157
sys-apps/ldconfig: bundle with musl.
sys-apps/ldconfig/Manifest | 3 -
sys-apps/ldconfig/files/ldconfig-0.1 | 141 ----------------------------------
sys-apps/ldconfig/ldconfig-0.1.ebuild | 34 --------
sys-apps/ldconfig/metadata.xml | 8 --
4 files changed, 186 deletions(-)
diff --git a/sys-apps/ldconfig/Manifest b/sys-apps/ldconfig/Manifest
deleted file mode 100644
index fecbe6c..0000000
--- a/sys-apps/ldconfig/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX ldconfig-0.1 2435 SHA256
1ae38d1acbae2860f8e3ec4f990f98013f6fea456d3a9572ec0c4b15a63a88a4 SHA512
1f94dbb37bca54d32282e0967ca2009db34bf10751c0c4b8852d5e4d0072c5c16a159b489d40b1da0c48249ae21ae90f1f0be71a0317481d39cab511ecae728b
WHIRLPOOL
6dfd8170581b847345ee61ee004d933f23649ca1714363ecb4d66f5525c50d8aeb7ad1cdc5e52f601eea769d83cb7be31c56f2e6d342dbe038fa9c7720b936d0
-EBUILD ldconfig-0.1.ebuild 607 SHA256
03b1a27b574e3160d6b6ae67e450c391cc3a6bceb09d7128dfda813ec4a9c70f SHA512
f6685e923ccccf985f96d62c349deb45e0bcdc510c8051ed285f09df3120754dbcfee02cd3daa811f28225af22a957ef7d8e662fcb8e3d0964457a7af1b2ec72
WHIRLPOOL
2569af7e1d0cf6890ff7cd165122851b72fb0d7cf11fb1a0b4db44ba554bff59d6711d3eb01ebebdb1ae2dfd4be43e22459a3197b903ee2cbc6f11230a6445e4
-MISC metadata.xml 238 SHA256
f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f SHA512
3c3d75f1cb90ffcfb98df47481fbde6d451254a29fa87577acd25bc27cbcc3e5dbc0c1efce5974be905428f0b7caf912c8b051417aff92763847fa377493a153
WHIRLPOOL
6ec3d597b87aff99014404b8b732e6f600aafc3c3eeebfab135c9c19cde2e43161cfa23f841bd72826cc3393b724e1dac115c15dcce2b74ace6f1d6ec209dbf3
diff --git a/sys-apps/ldconfig/files/ldconfig-0.1
b/sys-apps/ldconfig/files/ldconfig-0.1
deleted file mode 100644
index 7139450..0000000
--- a/sys-apps/ldconfig/files/ldconfig-0.1
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/bin/bash -e
-
-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)
-
-LDSO_PATH=$(ls /lib/ld-musl-*.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-apps/ldconfig/ldconfig-0.1.ebuild
b/sys-apps/ldconfig/ldconfig-0.1.ebuild
deleted file mode 100644
index 05ab221..0000000
--- a/sys-apps/ldconfig/ldconfig-0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DESCRIPTION="ldconfig for musl in Gentoo"
-HOMEPAGE="http://dev.gentoo.org/~blueness";
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-#KEYWORDS="~amd64"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-pkg_preinst () {
- use elibc_musl || die "This package only works on a musl system"
-}
-
-src_unpack () {
- mkdir -p ${P}
- cp "${FILESDIR}"/${P} ${P}/${PN}
-}
-
-src_install () {
- into /
- dosbin ${PN}
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl
- doenvd "${T}"/00musl || die
-}
diff --git a/sys-apps/ldconfig/metadata.xml b/sys-apps/ldconfig/metadata.xml
deleted file mode 100644
index 1e75873..0000000
--- a/sys-apps/ldconfig/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer>
- <email>[email protected]</email>
- <name>Anthony G. Basile</name>
- </maintainer>
-</pkgmetadata>
