mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 17:09:10 -07:00
Merge updates from master
This commit is contained in:
@@ -338,7 +338,9 @@ _python_export() {
|
||||
debug-print "${FUNCNAME}: EPYTHON = ${EPYTHON}"
|
||||
;;
|
||||
PYTHON)
|
||||
export PYTHON=${BROOT}/usr/bin/${impl}
|
||||
# Under EAPI 7+, this should just use ${BROOT}, but Portage
|
||||
# <3.0.50 was buggy, and prefix users need this to update.
|
||||
export PYTHON=${BROOT-${EPREFIX}}/usr/bin/${impl}
|
||||
debug-print "${FUNCNAME}: PYTHON = ${PYTHON}"
|
||||
;;
|
||||
PYTHON_SITEDIR)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@@ -16,7 +16,7 @@ src_compile() {
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake PREFIX="${EPREFIX}"/usr LIBDIR="$(get_libdir)" DESTDIR="${ED}" install
|
||||
emake PREFIX="${EPREFIX}"/usr LIBDIR="$(get_libdir)" DESTDIR="${D}" install
|
||||
|
||||
mkdir -p "${ED}"/usr/share || die
|
||||
mv "${ED}/usr/$(get_libdir)/pkgconfig" "${ED}"/usr/share/ || die
|
||||
|
||||
@@ -16,7 +16,7 @@ src_compile() {
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake PREFIX="${EPREFIX}"/usr LIBDIR="$(get_libdir)" DESTDIR="${ED}" install
|
||||
emake PREFIX="${EPREFIX}"/usr LIBDIR="$(get_libdir)" DESTDIR="${D}" install
|
||||
|
||||
mkdir -p "${ED}"/usr/share || die
|
||||
mv "${ED}/usr/$(get_libdir)/pkgconfig" "${ED}"/usr/share/ || die
|
||||
|
||||
Reference in New Issue
Block a user