From 7fa74eeae6b0bce1a7966730a7acad6f803b7327 Mon Sep 17 00:00:00 2001 From: dsaf Date: Mon, 22 Jun 2026 17:32:27 -0300 Subject: [PATCH] dev-games/godot-dotnet: respect AR & RANLIB Closes: https://bugs.gentoo.org/975978 Signed-off-by: dsaf --- .../godot-dotnet/files/godot-4.5-scons.patch | 16 ++++++++++------ dev-games/godot-dotnet/godot-dotnet-4.6.3.ebuild | 3 +-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dev-games/godot-dotnet/files/godot-4.5-scons.patch b/dev-games/godot-dotnet/files/godot-4.5-scons.patch index ac1fd270ed..581d5dda07 100644 --- a/dev-games/godot-dotnet/files/godot-4.5-scons.patch +++ b/dev-games/godot-dotnet/files/godot-4.5-scons.patch @@ -1,16 +1,20 @@ +Respect AR (bug #977691), RANLIB, and avoid passing unnecessary flags. --- a/SConstruct +++ b/SConstruct -@@ -304,2 +304,3 @@ - opts.Add("CC", "C compiler binary") -+opts.Add("AR", "Archiver") - opts.Add("LINK", "Linker binary") -@@ -745,3 +746,3 @@ +@@ -804,3 +804,3 @@ # `-msse2` is implied when compiling for x86_64. - env.Append(CCFLAGS=["-msse4.2", "-mpopcnt"]) + pass elif env["arch"] == "x86_32": -@@ -817,3 +818,3 @@ +@@ -883,3 +883,3 @@ else: - env.AppendUnique(LINKFLAGS=["-s"]) + pass +--- a/platform/linuxbsd/detect.py ++++ b/platform/linuxbsd/detect.py +@@ -118,2 +118,4 @@ + ## Compiler configuration ++ env["AR"] = os.environ["AR"] ++ env["RANLIB"] = os.environ["RANLIB"] + diff --git a/dev-games/godot-dotnet/godot-dotnet-4.6.3.ebuild b/dev-games/godot-dotnet/godot-dotnet-4.6.3.ebuild index dd57290d03..faf30e69d4 100644 --- a/dev-games/godot-dotnet/godot-dotnet-4.6.3.ebuild +++ b/dev-games/godot-dotnet/godot-dotnet-4.6.3.ebuild @@ -328,11 +328,10 @@ src_prepare() { src_compile() { local -x BUILD_NAME=${BRANDING_OS_ID} # replaces "custom_build" in version + tc-export AR CC CXX RANLIB filter-lto #921017 local esconsargs=( - AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)" - progress=no verbose=yes