From 69fa5df28f820ec8382af85de34fcd2a118be0c5 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 9 Aug 2024 13:43:08 -0400 Subject: [PATCH] common/build-style/meson: move PYTHONUNBUFFERED to environment/build-style --- common/build-style/meson.sh | 5 ++--- common/environment/build-style/meson.sh | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/build-style/meson.sh b/common/build-style/meson.sh index 052cf89a758..67b9dc110b9 100644 --- a/common/build-style/meson.sh +++ b/common/build-style/meson.sh @@ -20,7 +20,7 @@ do_configure() { export AR="gcc-ar" # unbuffered output for continuous logging - PYTHONUNBUFFERED=1 ${meson_cmd} setup \ + ${meson_cmd} setup \ --prefix=/usr \ --libdir=/usr/lib${XBPS_TARGET_WORDSIZE} \ --libexecdir=/usr/libexec \ @@ -55,7 +55,6 @@ do_check() { : ${make_check_target:=test} : ${meson_builddir:=build} - export PYTHONUNBUFFERED=1 ${make_check_pre} ${make_cmd} ${make_check_target} -C ${meson_builddir} ${makejobs} ${make_check_args} } @@ -64,5 +63,5 @@ do_install() { : ${make_install_target:=install} : ${meson_builddir:=build} - env PYTHONUNBUFFERED=1 DESTDIR=${DESTDIR} ${make_cmd} -C ${meson_builddir} ${make_install_args} ${make_install_target} + DESTDIR=${DESTDIR} ${make_cmd} -C ${meson_builddir} ${make_install_args} ${make_install_target} } diff --git a/common/environment/build-style/meson.sh b/common/environment/build-style/meson.sh index dbfe93700f6..61b70ed5635 100644 --- a/common/environment/build-style/meson.sh +++ b/common/environment/build-style/meson.sh @@ -1,2 +1,4 @@ hostmakedepends+=" meson" build_helper+=" meson" + +export PYTHONUNBUFFERED=1