mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-25 07:31:01 +02:00
eclass/meson: Sync with Gentoo
It's from Gentoo commit 59c3eabf79595f15b091a64d649ca865441ce05d.
This commit is contained in:
parent
a04cf778f6
commit
5f9096bfea
@ -393,9 +393,6 @@ setup_meson_src_configure() {
|
|||||||
tc-export NM
|
tc-export NM
|
||||||
tc-getPROG READELF readelf >/dev/null
|
tc-getPROG READELF readelf >/dev/null
|
||||||
|
|
||||||
# https://bugs.gentoo.org/625396
|
|
||||||
python_export_utf8_locale
|
|
||||||
|
|
||||||
# https://bugs.gentoo.org/721786
|
# https://bugs.gentoo.org/721786
|
||||||
export BOOST_INCLUDEDIR="${BOOST_INCLUDEDIR-${EPREFIX}/usr/include}"
|
export BOOST_INCLUDEDIR="${BOOST_INCLUDEDIR-${EPREFIX}/usr/include}"
|
||||||
export BOOST_LIBRARYDIR="${BOOST_LIBRARYDIR-${EPREFIX}/usr/$(get_libdir)}"
|
export BOOST_LIBRARYDIR="${BOOST_LIBRARYDIR-${EPREFIX}/usr/$(get_libdir)}"
|
||||||
@ -412,6 +409,9 @@ meson_src_configure() {
|
|||||||
|
|
||||||
BUILD_DIR="${BUILD_DIR:-${WORKDIR}/${P}-build}"
|
BUILD_DIR="${BUILD_DIR:-${WORKDIR}/${P}-build}"
|
||||||
|
|
||||||
|
# https://bugs.gentoo.org/625396
|
||||||
|
python_export_utf8_locale
|
||||||
|
|
||||||
(
|
(
|
||||||
setup_meson_src_configure "$@"
|
setup_meson_src_configure "$@"
|
||||||
MESONARGS+=(
|
MESONARGS+=(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user