From 36024939cff7674ca57c97b839ac5c020ca607da Mon Sep 17 00:00:00 2001
From: OscarL <oscar.lesta@gmail.com>
Date: Thu, 25 May 2023 04:48:34 -0300
Subject: [PATCH] the_silver_searcher: fix build, simplify TEST_REQUIRES
 (#8727)

All tests pass using newely built `cmd:cram` (Python 3.9).
---
 .../the_silver_searcher-2.2.0.recipe          | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.recipe b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.recipe
index 1e7419be8..fb05266c6 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.recipe
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.recipe
@@ -10,25 +10,25 @@ parallel."
 HOMEPAGE="https://github.com/ggreer/the_silver_searcher/"
 COPYRIGHT="2013-2018 Geoff Greer"
 LICENSE="Apache v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/ggreer/the_silver_searcher/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="6a0a19ca5e73b2bef9481c29a508d2413ca1a0a9a5a6b1bd9bbd695a7626cbf9"
 SOURCE_FILENAME="the_silver_searcher-$portVersion.tar.gz"
 
 ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	SECONDARY_ARCHITECTURES="x86"
+fi
 
 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
-commandSuffix=$secondaryArchSuffix
 commandBinDir=$binDir
 if [ "$targetArchitecture" = x86_gcc2 ]; then
-    commandSuffix=
     commandBinDir=$prefix/bin
 fi
 
 PROVIDES="
 	the_silver_searcher$secondaryArchSuffix = $portVersion
-	cmd:ag$commandSuffix = $portVersion
+	cmd:ag = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -48,14 +48,13 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:autoheader
 	cmd:automake
-	cmd:clang_format
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
 TEST_REQUIRES="
-	cmd:cram2
+	cmd:cram
 	cmd:git
 	"
 
@@ -66,15 +65,17 @@ BUILD()
 	autoheader
 	automake --add-missing
 
+	# Avoid "multiple definition of" linking errors
+	export LDFLAGS="-z muldefs"
+	# We don't care if files are wrongly formatted, and this avoids a clang_format dependency.
+	export HAS_CLANG_FORMAT_FALSE=1
+
 	runConfigure --omit-dirs binDir ./configure \
 		--bindir=$commandBinDir
 
 	# Build fix, remove if solved
 	sed --in-place '/HAVE_FOPENCOOKIE/d' src/config.h
 
-	# Test fix
-	sed -i 's/cram/cram2/g' Makefile
-
 	make $jobArgs
 }