From 22bcac9904404c125423868af7849e98dfa5fdda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sun, 5 Jan 2025 15:19:03 +0100
Subject: [PATCH] module_build: fix tests, remove optional test dependencies

Tests which invoke make or gcc are skipped properly if they are not found.
So these aren't really needed. Also, gcc would need further changes to
actually work on x86 (see the next commit).
---
 .../module_build/module_build-0.4234.recipe   | 13 ----------
 .../patches/module_build-0.4234.patchset      | 26 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/dev-perl/module_build/module_build-0.4234.recipe b/dev-perl/module_build/module_build-0.4234.recipe
index ecf374baa..f186144e4 100644
--- a/dev-perl/module_build/module_build-0.4234.recipe
+++ b/dev-perl/module_build/module_build-0.4234.recipe
@@ -32,19 +32,6 @@ BUILD_PREREQUIRES="
 	cmd:perl
 	"
 
-TEST_REQUIRES="
-	cmd:make
-	"
-if [ $targetArchitecture == "x86_gcc2" ]; then
-	TEST_REQUIRES+="
-		cmd:gcc_x86
-		"
-else
-	TEST_REQUIRES+="
-		cmd:gcc
-		"
-fi
-
 BUILD()
 {
 	perl Build.PL --installdirs vendor --prefix $prefix
diff --git a/dev-perl/module_build/patches/module_build-0.4234.patchset b/dev-perl/module_build/patches/module_build-0.4234.patchset
index 88d1f06d2..6b687ad18 100644
--- a/dev-perl/module_build/patches/module_build-0.4234.patchset
+++ b/dev-perl/module_build/patches/module_build-0.4234.patchset
@@ -1,4 +1,4 @@
-From 6ae92aaff5292e8b0095d0dc0ac42ff5ee1442f0 Mon Sep 17 00:00:00 2001
+From b397d50d5f0b67cf25d555a9407963ee04173322 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
 Date: Sun, 4 Aug 2024 21:07:10 +0200
 Subject: hack to support naked 'perl' as the perl interpreter path
@@ -33,3 +33,27 @@ index 10b653f..0ee2515 100644
 -- 
 2.45.2
 
+
+From 0b4e07616333ae4643d1a93606c2b201687a0845 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
+Date: Sun, 5 Jan 2025 14:45:19 +0100
+Subject: fix tests
+
+$^X is just "perl" on Haiku which breaks if converted to an absolute path.
+
+diff --git a/t/lib/MBTest.pm b/t/lib/MBTest.pm
+index 2aeda20..3620523 100644
+--- a/t/lib/MBTest.pm
++++ b/t/lib/MBTest.pm
+@@ -57,7 +57,7 @@ BEGIN {
+   # We change directories, so expand @INC and $^X to absolute paths
+   # Also add .
+   @INC = (map(File::Spec->rel2abs($_), @INC), ".");
+-  $^X = File::Spec->rel2abs($^X);
++  $^X = '/bin/perl';
+ }
+ 
+ use Exporter;
+-- 
+2.45.2
+