From a068cc26b94a6fc7bdf7f3d2c6dcc9995d9a7f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= Date: Sun, 5 Jan 2025 15:23:00 +0100 Subject: [PATCH] config_autoconf, extutils_libbuilder: fix tests on x86_gcc2 haikuporter runs in a gcc2 environment when not building secondaryArch packages on x86_gcc2, so some additional environment changes are needed so that gcc-x86 actually works. --- dev-perl/config_autoconf/config_autoconf-0.320.recipe | 6 +++++- .../extutils_libbuilder/extutils_libbuilder-0.08.recipe | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dev-perl/config_autoconf/config_autoconf-0.320.recipe b/dev-perl/config_autoconf/config_autoconf-0.320.recipe index afb701732..9a95717f3 100644 --- a/dev-perl/config_autoconf/config_autoconf-0.320.recipe +++ b/dev-perl/config_autoconf/config_autoconf-0.320.recipe @@ -38,6 +38,7 @@ TEST_REQUIRES=" " if [ "$targetArchitecture" = x86_gcc2 ]; then TEST_REQUIRES+=" + haiku_x86_devel cmd:gcc_x86 " else @@ -64,5 +65,8 @@ INSTALL() TEST() { - make test + if [ "$targetArchitecture" = x86_gcc2 ]; then + gccSecondaryArch="CC=gcc-x86 LD=gcc-x86" + fi + make $gccSecondaryArch test } diff --git a/dev-perl/extutils_libbuilder/extutils_libbuilder-0.08.recipe b/dev-perl/extutils_libbuilder/extutils_libbuilder-0.08.recipe index 8760f1f2f..e78f6fcbf 100644 --- a/dev-perl/extutils_libbuilder/extutils_libbuilder-0.08.recipe +++ b/dev-perl/extutils_libbuilder/extutils_libbuilder-0.08.recipe @@ -32,6 +32,7 @@ BUILD_PREREQUIRES=" if [ "$targetArchitecture" = x86_gcc2 ]; then TEST_REQUIRES=" + haiku_x86_devel cmd:gcc_x86 " else @@ -57,5 +58,9 @@ INSTALL() } TEST() { + if [ "$targetArchitecture" = x86_gcc2 ]; then + export CC=gcc-x86 + export LD=gcc-x86 + fi ./Build test }