mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
sys-libs/musl: Create /etc/ld.so.conf.d directory like glibc does
Given that musl has long added an `include` directive for this directory to ld.so.conf, we believe not creating the directory was an accidental omission. gcc-config has special code to handle the case where it doesn't exist, but eselect modules like blas do not, and subsequently break. I have tested this, and both gcc-config and eselect-blas now behave as expected. There is no migration to do. The tools simply start using the directory once it is available. Signed-off-by: James Le Cuirot <chewi@gentoo.org>
This commit is contained in:
James Le Cuirot
208
sys-libs/musl/musl-1.2.3-r7.ebuild
Normal file
208
sys-libs/musl/musl-1.2.3-r7.ebuild
Normal file
@@ -0,0 +1,208 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_REPO_URI="git://git.musl-libc.org/musl"
|
||||
inherit git-r3
|
||||
else
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/musl.asc
|
||||
inherit verify-sig
|
||||
|
||||
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
|
||||
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
|
||||
KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
|
||||
|
||||
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
|
||||
fi
|
||||
GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
|
||||
GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
|
||||
SRC_URI+="
|
||||
https://dev.gentoo.org/~blueness/musl-misc/getconf.c
|
||||
https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
|
||||
https://dev.gentoo.org/~blueness/musl-misc/iconv.c
|
||||
"
|
||||
|
||||
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="https://musl.libc.org"
|
||||
|
||||
LICENSE="MIT LGPL-2 GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="crypt headers-only"
|
||||
|
||||
QA_SONAME="usr/lib/libc.so"
|
||||
QA_DT_NEEDED="usr/lib/libc.so"
|
||||
# bug #830213
|
||||
QA_PRESTRIPPED="usr/lib/crtn.o"
|
||||
|
||||
# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?)
|
||||
# built as part as crossdev. Also, elide the blockers when in cross-*,
|
||||
# as it doesn't make sense to block the normal CBUILD libxcrypt at all
|
||||
# there when we're installing into /usr/${CHOST} anyway.
|
||||
if [[ ${CATEGORY} == cross-* ]] ; then
|
||||
IUSE="${IUSE/crypt/+crypt}"
|
||||
else
|
||||
RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )"
|
||||
PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )"
|
||||
fi
|
||||
|
||||
is_crosscompile() {
|
||||
[[ ${CHOST} != ${CTARGET} ]]
|
||||
}
|
||||
|
||||
just_headers() {
|
||||
use 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
|
||||
|
||||
# fix for #667126, copied from glibc ebuild
|
||||
# make sure host make.conf doesn't pollute us
|
||||
if is_crosscompile || tc-is-cross-compiler ; then
|
||||
CHOST=${CTARGET} strip-unsupported-flags
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
git-r3_src_unpack
|
||||
elif use verify-sig ; then
|
||||
# We only verify the release; not the additional (fixed, safe) files
|
||||
# we download.
|
||||
# (Seem to get IPC error on verifying in cross?)
|
||||
! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
mkdir "${WORKDIR}"/misc || die
|
||||
cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die
|
||||
cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die
|
||||
cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
strip-flags # Prevent issues caused by aggressive optimizations & bug #877343
|
||||
tc-getCC ${CTARGET}
|
||||
|
||||
just_headers && export CC=true
|
||||
|
||||
local sysroot
|
||||
is_crosscompile && sysroot=/usr/${CTARGET}
|
||||
./configure \
|
||||
--target=${CTARGET} \
|
||||
--prefix=${EPREFIX}${sysroot}/usr \
|
||||
--syslibdir=${EPREFIX}${sysroot}/lib \
|
||||
--disable-gcc-wrapper || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake obj/include/bits/alltypes.h
|
||||
just_headers && return 0
|
||||
|
||||
emake
|
||||
if [[ ${CATEGORY} != cross-* ]] ; then
|
||||
emake -C "${T}" getconf getent iconv \
|
||||
CC="$(tc-getCC)" \
|
||||
CFLAGS="${CFLAGS}" \
|
||||
CPPFLAGS="${CPPFLAGS}" \
|
||||
LDFLAGS="${LDFLAGS}" \
|
||||
VPATH="${WORKDIR}/misc"
|
||||
fi
|
||||
|
||||
$(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die
|
||||
$(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || 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 "${ED}"${sysroot}/lib/ld-musl-*)
|
||||
dosym ${EPREFIX}${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
|
||||
|
||||
if ! use crypt ; then
|
||||
# Allow sys-libs/libxcrypt[system] to provide it instead
|
||||
rm "${ED}/usr/include/crypt.h" || die
|
||||
rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die
|
||||
fi
|
||||
|
||||
if [[ ${CATEGORY} != cross-* ]] ; then
|
||||
# Fish out of config:
|
||||
# ARCH = ...
|
||||
# SUBARCH = ...
|
||||
# and print $(ARCH)$(SUBARCH).
|
||||
local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
|
||||
|
||||
# The musl build system seems to create a symlink:
|
||||
# ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute)
|
||||
# During cross or within prefix, there's no guarantee that the host is
|
||||
# using musl so that file may not exist. Use a relative symlink within
|
||||
# ${D} instead.
|
||||
rm -f "${ED}"/lib/ld-musl-${arch}.so.1 || die
|
||||
dosym8 -r /usr/lib/libc.so /lib/ld-musl-${arch}.so.1
|
||||
|
||||
# If it's still a dead symlnk, OK, we really do need to abort.
|
||||
[[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
|
||||
|
||||
cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die
|
||||
sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
|
||||
eprefixify "${T}"/ldconfig
|
||||
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
|
||||
fi
|
||||
|
||||
if is_crosscompile ; then
|
||||
into /usr/${CTARGET}
|
||||
dolib.a libssp_nonshared.a
|
||||
else
|
||||
dolib.a libssp_nonshared.a
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# nothing to do if just installing headers
|
||||
just_headers && return
|
||||
|
||||
# prepare /etc/ld.so.conf.d/ for files
|
||||
mkdir -p "${EROOT}"/etc/ld.so.conf.d
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
is_crosscompile && return 0
|
||||
|
||||
[ -n "${ROOT}" ] && return 0
|
||||
|
||||
ldconfig || die
|
||||
}
|
||||
@@ -191,6 +191,14 @@ src_install() {
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# nothing to do if just installing headers
|
||||
just_headers && return
|
||||
|
||||
# prepare /etc/ld.so.conf.d/ for files
|
||||
mkdir -p "${EROOT}"/etc/ld.so.conf.d
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
is_crosscompile && return 0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user