overlay

commit: e051c616ad8678d05e38242633f7cd9abefa3ca2
parent 0cb6ba7d9a417acec3ad80de68b143389b627f2a
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Fri, 20 Dec 2024 00:16:27 +0100

dev-games/godot: rebase godot-4.3-scons.patch

Diffstat:
M
dev-games/godot/files/godot-4.3-scons.patch
34
++++++++++++++++++----------------

1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/dev-games/godot/files/godot-4.3-scons.patch b/dev-games/godot/files/godot-4.3-scons.patch
@@ -1,14 +1,17 @@
-commit 70b4027ff97fe5aa0c9792020795cab38645a354
-Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
-Date:   2024-06-14 13:13:14 +0200
+From efb2d5ef9fb64d681036a617c40e42be29ab3e9c Mon Sep 17 00:00:00 2001
+From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
+Date: Fri, 14 Jun 2024 13:13:14 +0200
+Subject: [PATCH] scons: $AR, disable stripping
 
-    scons: $AR, disable stripping
+---
+ SConstruct | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/SConstruct b/SConstruct
-index f4b8f03519..4b2bee8ee8 100644
+index 8d2d0b4eb8..b580977bac 100644
 --- a/SConstruct
 +++ b/SConstruct
-@@ -292,6 +292,7 @@ opts.Add(BoolVariable("builtin_zstd", "Use the built-in Zstd library", True))
+@@ -290,6 +290,7 @@ opts.Add(BoolVariable("builtin_zstd", "Use the built-in Zstd library", True))
  # be overridden for a specific platform), the lowercase ones are appended.
  opts.Add("CXX", "C++ compiler binary")
  opts.Add("CC", "C compiler binary")
@@ -16,16 +19,15 @@ index f4b8f03519..4b2bee8ee8 100644
  opts.Add("LINK", "Linker binary")
  opts.Add("cppdefines", "Custom defines for the pre-processor")
  opts.Add("ccflags", "Custom flags for both the C and C++ compilers")
-@@ -720,12 +721,6 @@ else:
-             # Remap absolute paths to relative paths for debug symbols.
-             project_path = Dir("#").abspath
-             env.Append(CCFLAGS=[f"-ffile-prefix-map={project_path}=."])
--    else:
--        if methods.using_clang(env) and not methods.is_vanilla_clang(env):
--            # Apple Clang, its linker doesn't like -s.
--            env.Append(LINKFLAGS=["-Wl,-S", "-Wl,-x", "-Wl,-dead_strip"])
+@@ -751,8 +752,6 @@ else:
+         if methods.is_apple_clang(env):
+             # Apple Clang, its linker doesn't like -s.
+             env.Append(LINKFLAGS=["-Wl,-S", "-Wl,-x", "-Wl,-dead_strip"])
 -        else:
 -            env.Append(LINKFLAGS=["-s"])
  
-     if env["optimize"] == "speed":
-         env.Append(CCFLAGS=["-O3"])
+     # Linker needs optimization flags too, at least for Emscripten.
+     # For other toolchains, this _may_ be useful for LTO too to disambiguate.
+-- 
+2.45.2
+