mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-16 14:29:05 -07:00
Merge updates from master
This commit is contained in:
Repository mirror & CI
43
dev-libs/libbsd/libbsd-0.11.7-r2.ebuild
Normal file
43
dev-libs/libbsd/libbsd-0.11.7-r2.ebuild
Normal file
@@ -0,0 +1,43 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/guillemjover.asc
|
||||
inherit multilib multilib-minimal verify-sig
|
||||
|
||||
DESCRIPTION="Library to provide useful functions commonly found on BSD systems"
|
||||
HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
|
||||
SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
|
||||
SRC_URI+=" verify-sig? ( https://${PN}.freedesktop.org/releases/${P}.tar.xz.asc )"
|
||||
|
||||
LICENSE="BSD BSD-2 BSD-4 ISC"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="static-libs"
|
||||
|
||||
RDEPEND="app-crypt/libmd[${MULTILIB_USEDEP}]"
|
||||
DEPEND="${RDEPEND}
|
||||
>=sys-kernel/linux-headers-3.17
|
||||
"
|
||||
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-guillemjover )"
|
||||
|
||||
multilib_src_configure() {
|
||||
# The build system will install libbsd-ctor.a despite USE="-static-libs"
|
||||
# which is correct, see:
|
||||
# https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
|
||||
ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
find "${ED}" -type f -name "*.la" -delete || die
|
||||
|
||||
# ld scripts on standalone prefix (RAP) systems should have the prefix
|
||||
# stripped from any paths, as the sysroot is automatically prepended.
|
||||
local ldscript=${ED}/usr/$(get_libdir)/${PN}$(get_libname)
|
||||
if use prefix && ! use prefix-guest && grep -qIF "ld script" "${ldscript}" 2>/dev/null; then
|
||||
sed -i "s|${EPREFIX}/|/|g" "${ldscript}" || die
|
||||
fi
|
||||
}
|
||||
@@ -332,7 +332,7 @@ _python_export() {
|
||||
debug-print "${FUNCNAME}: EPYTHON = ${EPYTHON}"
|
||||
;;
|
||||
PYTHON)
|
||||
export PYTHON=${EPREFIX}/usr/bin/${impl}
|
||||
export PYTHON=${BROOT-${EPREFIX}}/usr/bin/${impl}
|
||||
debug-print "${FUNCNAME}: PYTHON = ${PYTHON}"
|
||||
;;
|
||||
PYTHON_SITEDIR)
|
||||
|
||||
@@ -719,6 +719,19 @@ toolchain_src_prepare() {
|
||||
einfo "Remove texinfo (bug #198182, bug #464008)"
|
||||
eapply "${FILESDIR}"/gcc-configure-texinfo.patch
|
||||
|
||||
if ! use prefix-guest && [[ -n ${EPREFIX} ]] ; then
|
||||
einfo "Prefixifying dynamic linkers..."
|
||||
for f in gcc/config/*/*linux*.h ; do
|
||||
ebegin " Updating ${f}"
|
||||
if [[ ${f} == gcc/config/rs6000/linux*.h ]]; then
|
||||
sed -i -r "s,(DYNAMIC_LINKER_PREFIX\s+)\"\",\1\"${EPREFIX}\",g" "${f}" || die
|
||||
else
|
||||
sed -i -r "/_DYNAMIC_LINKER/s,([\":])(/lib),\1${EPREFIX}\2,g" "${f}" || die
|
||||
fi
|
||||
eend $?
|
||||
done
|
||||
fi
|
||||
|
||||
# >=gcc-4
|
||||
if [[ -x contrib/gcc_update ]] ; then
|
||||
einfo "Touching generated files"
|
||||
@@ -1200,6 +1213,21 @@ toolchain_src_configure() {
|
||||
confgcc+=( --enable-threads=posix )
|
||||
;;
|
||||
esac
|
||||
|
||||
if ! use prefix-guest ; then
|
||||
# GNU ld scripts, such as those in glibc, reference unprefixed paths
|
||||
# as the sysroot given here is automatically prepended. For
|
||||
# prefix-guest, we use the host's libc instead.
|
||||
if [[ -n ${EPREFIX} ]] ; then
|
||||
confgcc+=( --with-sysroot="${EPREFIX}" )
|
||||
fi
|
||||
|
||||
# We need to build against the right headers and libraries. Again,
|
||||
# for prefix-guest, this is the host's.
|
||||
if [[ -n ${ESYSROOT} ]] ; then
|
||||
confgcc+=( --with-build-sysroot="${ESYSROOT}" )
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# __cxa_atexit is "essential for fully standards-compliant handling of
|
||||
|
||||
@@ -39,6 +39,13 @@ gen_usr_ldscript() {
|
||||
tc-is-static-only && return
|
||||
use prefix && return
|
||||
|
||||
# The toolchain's sysroot is automatically prepended to paths in this
|
||||
# script. We therefore need to omit EPREFIX on standalone prefix (RAP)
|
||||
# systems. prefix-guest (non-RAP) systems don't apply a sysroot so EPREFIX
|
||||
# is still needed in that case. This is moot because the above line makes
|
||||
# the function a noop on prefix, but we keep this in case that changes.
|
||||
local prefix=$(usex prefix-guest "${EPREFIX}" "")
|
||||
|
||||
# We only care about stuffing / for the native ABI. #479448
|
||||
if [[ $(type -t multilib_is_native_abi) == "function" ]] ; then
|
||||
multilib_is_native_abi || return 0
|
||||
@@ -154,7 +161,7 @@ gen_usr_ldscript() {
|
||||
See bug https://bugs.gentoo.org/4411 for more info.
|
||||
*/
|
||||
${output_format}
|
||||
GROUP ( ${EPREFIX}/${libdir}/${tlib} )
|
||||
GROUP ( ${prefix}/${libdir}/${tlib} )
|
||||
END_LDSCRIPT
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# -*- mode: shell-script; -*-
|
||||
# Copyright 2018-2021 Gentoo Authors
|
||||
# Copyright 2018-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
# RAP specific patches pending upstream:
|
||||
@@ -9,38 +9,7 @@
|
||||
# Disable RAP trick during bootstrap stage2
|
||||
[[ -z ${BOOTSTRAP_RAP_STAGE2} ]] || return 0
|
||||
|
||||
if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == configure ]]; then
|
||||
cd "${S}"
|
||||
einfo "Prefixifying dynamic linkers..."
|
||||
for h in gcc/config/*/*linux*.h; do
|
||||
ebegin " Updating $h"
|
||||
if [[ "${h}" == gcc/config/rs6000/linux*.h ]]; then
|
||||
sed -i -r "s,(DYNAMIC_LINKER_PREFIX\s+)\"\",\1\"${EPREFIX}\",g" $h
|
||||
else
|
||||
sed -i -r "/_DYNAMIC_LINKER/s,([\":])(/lib),\1${EPREFIX}\2,g" $h
|
||||
fi
|
||||
eend $?
|
||||
done
|
||||
|
||||
# use sysroot of toolchain to get correct include and library at compile time
|
||||
EXTRA_ECONF="${EXTRA_ECONF} --with-sysroot=${EPREFIX}"
|
||||
|
||||
ebegin "remove --sysroot call on ld for native toolchain"
|
||||
sed -i 's/--sysroot=%R//' gcc/gcc.c*
|
||||
eend $?
|
||||
elif [[ ${CATEGORY}/${PN} == sys-devel/clang && ${EBUILD_PHASE} == configure ]]; then
|
||||
ebegin "Use ${EPREFIX} as default sysroot"
|
||||
sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" "${S}"/CMakeLists.txt
|
||||
eend $?
|
||||
pushd "${S}/lib/Driver/ToolChains" >/dev/null
|
||||
ebegin "Use dynamic linker from ${EPREFIX}"
|
||||
sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX%/}/\"@" Linux.cpp
|
||||
eend $?
|
||||
ebegin "Remove --sysroot call on ld for native toolchain"
|
||||
sed -i -e "$(grep -n -B1 sysroot= Gnu.cpp | sed -ne '{1s/-.*//;1p}'),+1 d" Gnu.cpp
|
||||
eend $?
|
||||
popd >/dev/null
|
||||
elif [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare ]]; then
|
||||
if [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare ]]; then
|
||||
ebegin "Prefixifying native library path"
|
||||
sed -i -r "/NATIVE_LIB_DIRS/s,((/usr(/local|)|)/lib),${EPREFIX}\1,g" \
|
||||
"${S}"/ld/configure.tgt
|
||||
|
||||
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
|
||||
#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
@@ -235,7 +235,7 @@ src_prepare() {
|
||||
|
||||
if use prefix; then
|
||||
hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
|
||||
hprefixify etc/shells share.Linux/passwd
|
||||
hprefixify etc/shells share/passwd
|
||||
hprefixify -w '/PATH=/' etc/env.d/50baselayout
|
||||
hprefixify -w 1 etc/env.d/50baselayout
|
||||
echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
|
||||
|
||||
@@ -1,376 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit multilib prefix
|
||||
|
||||
DESCRIPTION="Filesystem baselayout and init scripts"
|
||||
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
|
||||
if [[ ${PV} = 9999 ]]; then
|
||||
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="build +split-usr"
|
||||
|
||||
RDEPEND="!sys-apps/baselayout-prefix"
|
||||
|
||||
pkg_setup() {
|
||||
multilib_layout
|
||||
}
|
||||
|
||||
riscv_compat_symlink() {
|
||||
# Here we apply some special sauce for riscv.
|
||||
# Two multilib layouts exist for now:
|
||||
# 1) one level libdirs, (32bit) "lib" and (64bit) "lib64"
|
||||
# these are chosen by us to closely resemble other arches
|
||||
# 2) two level libdirs, "lib64/lp64d" "lib64/lp64" "lib32/ilp32d" ...
|
||||
# this is the glibc/gcc default
|
||||
# Unfortunately, the default has only one fallback, which is "lib"
|
||||
# for both 32bit and 64bit. So things do not break in 1), we need
|
||||
# to provide compatibility symlinks...
|
||||
|
||||
# This function has exactly two parameters:
|
||||
# - the default libdir, to determine if 1) or 2) applies
|
||||
# - the location of the symlink (which points to ".")
|
||||
|
||||
# Note: we call this only in the ${SYMLINK_LIB} = no codepath, since
|
||||
# there never was a ${SYMLINK_LIB} = yes riscv profile.
|
||||
|
||||
case ${CHOST} in
|
||||
riscv*)
|
||||
# are we on a one level libdir profile? is there no symlink yet?
|
||||
if [[ ${1} != */* && ! -L ${2} ]] ; then
|
||||
ln -s . $2 || die "Unable to make $2 riscv compatibility symlink"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Create our multilib dirs - the Makefile has no knowledge of this
|
||||
multilib_layout() {
|
||||
local dir def_libdir libdir libdirs
|
||||
local prefix prefix_lst
|
||||
def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
|
||||
libdirs=$(get_all_libdirs)
|
||||
|
||||
if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
|
||||
prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
|
||||
for prefix in "${prefix_lst[@]}"; do
|
||||
for libdir in ${libdirs}; do
|
||||
dir="${prefix}${libdir}"
|
||||
if [[ -e "${dir}" ]]; then
|
||||
[[ ! -d "${dir}" ]] &&
|
||||
die "${dir} exists but is not a directory"
|
||||
continue
|
||||
fi
|
||||
if ! use split-usr && [[ ${prefix} = ${EROOT}/ ]]; then
|
||||
libdir="${libdir%%/*}"
|
||||
dir="${prefix}${libdir}"
|
||||
einfo "symlinking ${dir} to usr/${libdir}"
|
||||
ln -s usr/${libdir} ${dir} ||
|
||||
die "Unable to make ${dir} symlink"
|
||||
else
|
||||
einfo "creating directory ${dir}"
|
||||
mkdir -p "${dir}" ||
|
||||
die "Unable to create ${dir} directory"
|
||||
fi
|
||||
done
|
||||
[[ -d "${prefix}${def_libdir}" ]] && riscv_compat_symlink "${def_libdir}" "${prefix}${def_libdir}/${DEFAULT_ABI}"
|
||||
done
|
||||
return 0
|
||||
fi
|
||||
|
||||
[ -z "${def_libdir}" ] &&
|
||||
die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
|
||||
|
||||
# figure out which paths should be symlinks and which should be directories
|
||||
local dirs syms exp d
|
||||
for libdir in ${libdirs} ; do
|
||||
if use split-usr ; then
|
||||
exp=( {,usr/,usr/local/}${libdir} )
|
||||
else
|
||||
exp=( {usr/,usr/local/}${libdir} )
|
||||
fi
|
||||
for d in "${exp[@]}" ; do
|
||||
# most things should be dirs
|
||||
if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
|
||||
[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
|
||||
else
|
||||
[ -h "${d}" ] && syms+=" ${d}"
|
||||
fi
|
||||
done
|
||||
done
|
||||
if [ -n "${syms}${dirs}" ] ; then
|
||||
ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
|
||||
ewarn "have these paths configured as follows:"
|
||||
[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
|
||||
[ -n "${syms}" ] && ewarn "directories:${syms}"
|
||||
ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
|
||||
ewarn "If things fail, you will need to manually create/move the directories."
|
||||
echo
|
||||
fi
|
||||
|
||||
# setup symlinks and dirs where we expect them to be; do not migrate
|
||||
# data ... just fall over in that case.
|
||||
if use split-usr ; then
|
||||
prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
|
||||
else
|
||||
prefix_lst=( "${EROOT}"/{usr/,usr/local/} )
|
||||
fi
|
||||
for prefix in "${prefix_lst[@]}"; do
|
||||
if [ "${SYMLINK_LIB}" = yes ] ; then
|
||||
# we need to make sure "lib" points to the native libdir
|
||||
if [ -h "${prefix}lib" ] ; then
|
||||
# it's already a symlink! assume it's pointing to right place ...
|
||||
continue
|
||||
elif [ -d "${prefix}lib" ] ; then
|
||||
# "lib" is a dir, so need to convert to a symlink
|
||||
ewarn "Converting ${prefix}lib from a dir to a symlink"
|
||||
rm -f "${prefix}lib"/.keep || die
|
||||
if rmdir "${prefix}lib" 2>/dev/null ; then
|
||||
ln -s ${def_libdir} "${prefix}lib" || die
|
||||
else
|
||||
die "non-empty dir found where we needed a symlink: ${prefix}lib"
|
||||
fi
|
||||
else
|
||||
# nothing exists, so just set it up sanely
|
||||
ewarn "Initializing ${prefix}lib as a symlink"
|
||||
mkdir -p "${prefix}" || die
|
||||
rm -f "${prefix}lib" || die
|
||||
ln -s ${def_libdir} "${prefix}lib" || die
|
||||
mkdir -p "${prefix}${def_libdir}" || die #423571
|
||||
fi
|
||||
else
|
||||
# we need to make sure "lib" is a dir
|
||||
if [ -h "${prefix}lib" ] ; then
|
||||
# "lib" is a symlink, so need to convert to a dir
|
||||
ewarn "Converting ${prefix}lib from a symlink to a dir"
|
||||
rm -f "${prefix}lib" || die
|
||||
if [ -d "${prefix}lib32" ] ; then
|
||||
ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
|
||||
mv "${prefix}lib32" "${prefix}lib" || die
|
||||
else
|
||||
mkdir -p "${prefix}lib" || die
|
||||
fi
|
||||
elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
|
||||
# make sure the old "lib" ABI location does not exist; we
|
||||
# only symlinked the lib dir on systems where we moved it
|
||||
# to "lib32" ...
|
||||
case ${CHOST} in
|
||||
i?86*|x86_64*|powerpc*|sparc*|s390*)
|
||||
if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
|
||||
rm -f "${prefix}lib32"/.keep || die
|
||||
if ! rmdir "${prefix}lib32" 2>/dev/null ; then
|
||||
ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
|
||||
die "non-empty dir found where there should be none: ${prefix}lib32"
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
else
|
||||
# nothing exists, so just set it up sanely
|
||||
ewarn "Initializing ${prefix}lib as a dir"
|
||||
mkdir -p "${prefix}lib" || die
|
||||
fi
|
||||
fi
|
||||
done
|
||||
if ! use split-usr ; then
|
||||
for libdir in ${libdirs}; do
|
||||
if [[ ! -e "${EROOT}${libdir}" ]]; then
|
||||
ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
|
||||
die "Unable to make ${EROOT}${libdir} symlink"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# This is written in src_install (so it's in CONTENTS), but punt all
|
||||
# pending updates to avoid user having to do etc-update (and make the
|
||||
# pkg_postinst logic simpler).
|
||||
rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die
|
||||
|
||||
# We need to install directories and maybe some dev nodes when building
|
||||
# stages, but they cannot be in CONTENTS.
|
||||
# Also, we cannot reference $S as binpkg will break so we do this.
|
||||
multilib_layout
|
||||
if use build ; then
|
||||
if use split-usr ; then
|
||||
emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
|
||||
else
|
||||
emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
|
||||
fi
|
||||
fi
|
||||
rm -f "${ED}"/usr/share/${PN}/Makefile || die
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# don't want symlinked directories in PATH on systems with usr-merge
|
||||
if ! use split-usr && ! use prefix-guest; then
|
||||
sed \
|
||||
-e 's|:/usr/sbin:|:|g' \
|
||||
-e 's|:/sbin:|:|g' \
|
||||
-e 's|:/bin:|:|g' \
|
||||
-i etc/env.d/50baselayout || die
|
||||
fi
|
||||
|
||||
if use prefix; then
|
||||
hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
|
||||
hprefixify etc/shells share.Linux/passwd
|
||||
hprefixify -w '/PATH=/' etc/env.d/50baselayout
|
||||
hprefixify -w 1 etc/env.d/50baselayout
|
||||
echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
|
||||
|
||||
# change branding
|
||||
sed -i \
|
||||
-e '/gentoo-release/s/Gentoo Base/Gentoo Prefix Base/' \
|
||||
-e '/make_os_release/s/${OS}/Prefix/' \
|
||||
Makefile || die
|
||||
fi
|
||||
|
||||
# handle multilib paths. do it here because we want this behavior
|
||||
# regardless of the C library that you're using. we do explicitly
|
||||
# list paths which the native ldconfig searches, but this isn't
|
||||
# problematic as it doesn't change the resulting ld.so.cache or
|
||||
# take longer to generate. similarly, listing both the native
|
||||
# path and the symlinked path doesn't change the resulting cache.
|
||||
local libdir ldpaths
|
||||
for libdir in $(get_all_libdirs) ; do
|
||||
if use split-usr || use prefix-guest; then
|
||||
ldpaths+=":${EPREFIX}/${libdir}"
|
||||
fi
|
||||
ldpaths+=":${EPREFIX}/usr/${libdir}"
|
||||
ldpaths+=":${EPREFIX}/usr/local/${libdir}"
|
||||
done
|
||||
echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake \
|
||||
DESTDIR="${ED}" \
|
||||
install
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]] ; then
|
||||
# add SDK path which contains development manpages
|
||||
echo "MANPATH=${EPREFIX}/MacOSX.sdk/usr/share/man" \
|
||||
> "${ED}"/etc/env.d/98macos-sdk
|
||||
fi
|
||||
|
||||
# need the makefile in pkg_preinst
|
||||
insinto /usr/share/${PN}
|
||||
doins Makefile
|
||||
|
||||
dodoc ChangeLog
|
||||
|
||||
# bug 858596
|
||||
if use prefix-guest ; then
|
||||
dodir sbin
|
||||
cat > "${ED}"/sbin/runscript <<- EOF
|
||||
#!/usr/bin/env sh
|
||||
source "${EPREFIX}/lib/gentoo/functions.sh"
|
||||
|
||||
eerror "runscript/openrc-run not supported by Gentoo Prefix Base System release ${PV}" 1>&2
|
||||
exit 1
|
||||
EOF
|
||||
chmod 755 "${ED}"/sbin/runscript || die
|
||||
cp "${ED}"/sbin/{runscript,openrc-run} || die
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
local x
|
||||
|
||||
# We installed some files to /usr/share/baselayout instead of /etc to stop
|
||||
# (1) overwriting the user's settings
|
||||
# (2) screwing things up when attempting to merge files
|
||||
# (3) accidentally packaging up personal files with quickpkg
|
||||
# If they don't exist then we install them
|
||||
for x in master.passwd passwd shadow group fstab ; do
|
||||
[ -e "${EROOT}/etc/${x}" ] && continue
|
||||
[ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue
|
||||
cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc || die
|
||||
done
|
||||
|
||||
# Force shadow permissions to not be world-readable #260993
|
||||
for x in shadow ; do
|
||||
if [ -e "${EROOT}/etc/${x}" ] ; then
|
||||
chmod o-rwx "${EROOT}/etc/${x}" || die
|
||||
fi
|
||||
done
|
||||
|
||||
# Take care of the etc-update for the user
|
||||
if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then
|
||||
mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release || die
|
||||
fi
|
||||
|
||||
# whine about users that lack passwords #193541
|
||||
if [[ -e "${EROOT}"/etc/shadow ]] ; then
|
||||
local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
|
||||
if [[ -n ${bad_users} ]] ; then
|
||||
echo
|
||||
ewarn "The following users lack passwords!"
|
||||
ewarn ${bad_users}
|
||||
fi
|
||||
fi
|
||||
|
||||
# whine about users with invalid shells #215698
|
||||
if [[ -e "${EROOT}"/etc/passwd ]] ; then
|
||||
local bad_shells=$(awk -F: 'system("test -e ${ROOT}" $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
|
||||
if [[ -n ${bad_shells} ]] ; then
|
||||
echo
|
||||
ewarn "The following users have non-existent shells!"
|
||||
ewarn "${bad_shells}"
|
||||
fi
|
||||
fi
|
||||
|
||||
# https://bugs.gentoo.org/361349
|
||||
if use kernel_linux; then
|
||||
mkdir -p "${EROOT}"/run || die
|
||||
|
||||
local found fstype mountpoint
|
||||
while read -r _ mountpoint fstype _; do
|
||||
[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
|
||||
done < "${ROOT}"/proc/mounts
|
||||
[[ -z ${found} ]] &&
|
||||
ewarn "You should reboot now to get /run mounted with tmpfs!"
|
||||
fi
|
||||
|
||||
for x in ${REPLACING_VERSIONS}; do
|
||||
if ver_test 2.4 -lt ${x}; then
|
||||
ewarn "After updating ${EROOT}/etc/profile, please run"
|
||||
ewarn "env-update && . /etc/profile"
|
||||
fi
|
||||
|
||||
if ver_test 2.6 -lt ${x}; then
|
||||
ewarn "Please run env-update then log out and back in to"
|
||||
ewarn "update your path."
|
||||
fi
|
||||
# clean up after 2.5 typos
|
||||
# https://bugs.gentoo.org/show_bug.cgi?id=656380
|
||||
if [[ ${x} == 2.5 ]]; then
|
||||
rm -fr "${EROOT}/{,usr" || die
|
||||
fi
|
||||
done
|
||||
|
||||
if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
|
||||
ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
|
||||
ewarn "Please migrate your changes."
|
||||
fi
|
||||
|
||||
# Restore /var/run and /var/lock if we just removed them from 2.11 or 2.12
|
||||
if [[ ! -L ${EROOT}/var/run && ! -e ${EROOT}/var/run ]]; then
|
||||
ln -s ../run "${EROOT}"/var/run
|
||||
fi
|
||||
if [[ ! -L ${EROOT}/var/lock && ! -e ${EROOT}/var/lock ]]; then
|
||||
ln -s ../run/lock "${EROOT}"/var/lock
|
||||
fi
|
||||
}
|
||||
@@ -235,7 +235,7 @@ src_prepare() {
|
||||
|
||||
if use prefix; then
|
||||
hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
|
||||
hprefixify etc/shells share.Linux/passwd
|
||||
hprefixify etc/shells share/passwd
|
||||
hprefixify -w '/PATH=/' etc/env.d/50baselayout
|
||||
hprefixify -w 1 etc/env.d/50baselayout
|
||||
echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
|
||||
|
||||
@@ -82,6 +82,10 @@ src_prepare() {
|
||||
eprefixify \
|
||||
lib/Frontend/InitHeaderSearch.cpp \
|
||||
lib/Driver/ToolChains/Darwin.cpp || die
|
||||
|
||||
if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
|
||||
sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
|
||||
fi
|
||||
}
|
||||
|
||||
check_distribution_components() {
|
||||
@@ -224,6 +228,7 @@ multilib_src_configure() {
|
||||
local clang_version=$(ver_cut 1-3 "${llvm_version}")
|
||||
|
||||
local mycmakeargs=(
|
||||
-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
|
||||
-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
|
||||
-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
|
||||
|
||||
@@ -95,6 +95,10 @@ src_prepare() {
|
||||
eprefixify \
|
||||
lib/Lex/InitHeaderSearch.cpp \
|
||||
lib/Driver/ToolChains/Darwin.cpp || die
|
||||
|
||||
if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
|
||||
sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
|
||||
fi
|
||||
}
|
||||
|
||||
check_distribution_components() {
|
||||
@@ -234,6 +238,7 @@ multilib_src_configure() {
|
||||
local clang_version=$(ver_cut 1-3 "${llvm_version}")
|
||||
|
||||
local mycmakeargs=(
|
||||
-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
|
||||
-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
|
||||
-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
|
||||
|
||||
@@ -86,6 +86,10 @@ src_prepare() {
|
||||
eprefixify \
|
||||
lib/Lex/InitHeaderSearch.cpp \
|
||||
lib/Driver/ToolChains/Darwin.cpp || die
|
||||
|
||||
if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
|
||||
sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
|
||||
fi
|
||||
}
|
||||
|
||||
check_distribution_components() {
|
||||
@@ -249,6 +253,7 @@ get_distribution_components() {
|
||||
|
||||
multilib_src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
|
||||
-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
|
||||
-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
|
||||
|
||||
@@ -85,6 +85,10 @@ src_prepare() {
|
||||
eprefixify \
|
||||
lib/Lex/InitHeaderSearch.cpp \
|
||||
lib/Driver/ToolChains/Darwin.cpp || die
|
||||
|
||||
if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
|
||||
sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
|
||||
fi
|
||||
}
|
||||
|
||||
check_distribution_components() {
|
||||
@@ -250,6 +254,7 @@ get_distribution_components() {
|
||||
|
||||
multilib_src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
|
||||
-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
|
||||
-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
|
||||
|
||||
@@ -85,6 +85,10 @@ src_prepare() {
|
||||
eprefixify \
|
||||
lib/Lex/InitHeaderSearch.cpp \
|
||||
lib/Driver/ToolChains/Darwin.cpp || die
|
||||
|
||||
if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
|
||||
sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
|
||||
fi
|
||||
}
|
||||
|
||||
check_distribution_components() {
|
||||
@@ -248,6 +252,7 @@ get_distribution_components() {
|
||||
|
||||
multilib_src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
|
||||
-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
|
||||
-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
|
||||
|
||||
@@ -85,6 +85,10 @@ src_prepare() {
|
||||
eprefixify \
|
||||
lib/Lex/InitHeaderSearch.cpp \
|
||||
lib/Driver/ToolChains/Darwin.cpp || die
|
||||
|
||||
if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
|
||||
sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
|
||||
fi
|
||||
}
|
||||
|
||||
check_distribution_components() {
|
||||
@@ -250,6 +254,7 @@ get_distribution_components() {
|
||||
|
||||
multilib_src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
|
||||
-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
|
||||
-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
|
||||
|
||||
@@ -85,6 +85,10 @@ src_prepare() {
|
||||
eprefixify \
|
||||
lib/Lex/InitHeaderSearch.cpp \
|
||||
lib/Driver/ToolChains/Darwin.cpp || die
|
||||
|
||||
if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
|
||||
sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
|
||||
fi
|
||||
}
|
||||
|
||||
check_distribution_components() {
|
||||
@@ -250,6 +254,7 @@ get_distribution_components() {
|
||||
|
||||
multilib_src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
|
||||
-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
|
||||
-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
|
||||
|
||||
@@ -1314,6 +1314,17 @@ glibc_do_src_install() {
|
||||
mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
|
||||
fi
|
||||
|
||||
# We configure toolchains for standalone prefix systems with a sysroot,
|
||||
# which is prepended to paths in ld scripts, so strip the prefix from these.
|
||||
# Before: GROUP ( /foo/lib64/libc.so.6 /foo/usr/lib64/libc_nonshared.a AS_NEEDED ( /foo/lib64/ld-linux-x86-64.so.2 ) )
|
||||
# After: GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) )
|
||||
if [[ -n $(host_eprefix) ]] ; then
|
||||
local file
|
||||
grep -lZIF "ld script" "${ED}/$(alt_usrlibdir)"/lib*.{a,so} 2>/dev/null | while read -rd '' file ; do
|
||||
sed -i "s|$(host_eprefix)/|/|g" "${file}" || die
|
||||
done
|
||||
fi
|
||||
|
||||
# We'll take care of the cache ourselves
|
||||
rm -f "${ED}"/etc/ld.so.cache
|
||||
|
||||
|
||||
@@ -1314,6 +1314,17 @@ glibc_do_src_install() {
|
||||
mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
|
||||
fi
|
||||
|
||||
# We configure toolchains for standalone prefix systems with a sysroot,
|
||||
# which is prepended to paths in ld scripts, so strip the prefix from these.
|
||||
# Before: GROUP ( /foo/lib64/libc.so.6 /foo/usr/lib64/libc_nonshared.a AS_NEEDED ( /foo/lib64/ld-linux-x86-64.so.2 ) )
|
||||
# After: GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) )
|
||||
if [[ -n $(host_eprefix) ]] ; then
|
||||
local file
|
||||
grep -lZIF "ld script" "${ED}/$(alt_usrlibdir)"/lib*.{a,so} 2>/dev/null | while read -rd '' file ; do
|
||||
sed -i "s|$(host_eprefix)/|/|g" "${file}" || die
|
||||
done
|
||||
fi
|
||||
|
||||
# We'll take care of the cache ourselves
|
||||
rm -f "${ED}"/etc/ld.so.cache
|
||||
|
||||
|
||||
@@ -1317,6 +1317,17 @@ glibc_do_src_install() {
|
||||
mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
|
||||
fi
|
||||
|
||||
# We configure toolchains for standalone prefix systems with a sysroot,
|
||||
# which is prepended to paths in ld scripts, so strip the prefix from these.
|
||||
# Before: GROUP ( /foo/lib64/libc.so.6 /foo/usr/lib64/libc_nonshared.a AS_NEEDED ( /foo/lib64/ld-linux-x86-64.so.2 ) )
|
||||
# After: GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) )
|
||||
if [[ -n $(host_eprefix) ]] ; then
|
||||
local file
|
||||
grep -lZIF "ld script" "${ED}/$(alt_usrlibdir)"/lib*.{a,so} 2>/dev/null | while read -rd '' file ; do
|
||||
sed -i "s|$(host_eprefix)/|/|g" "${file}" || die
|
||||
done
|
||||
fi
|
||||
|
||||
# We'll take care of the cache ourselves
|
||||
rm -f "${ED}"/etc/ld.so.cache
|
||||
|
||||
|
||||
Reference in New Issue
Block a user