File improve_linker_detection.patch of Package godot

Overview Repositories Revisions Requests Users Attributes Meta

File improve_linker_detection.patch of Package godot (Revision a1a957459019d46f29b1b4f8e8e804fb)

Currently displaying revision a1a957459019d46f29b1b4f8e8e804fb , Show latest

From: cunix@mail.de
Date: 2023-09-21 12:00:00
Subject: regex in linker detection for template builds fails sometimes to recognize correct ld version
References: https://github.com/godotengine/godot/issues/82078
Rebased: 2023-11-30

distro added stuff to "ld --version" output prevents correct
version detection.
regex adjusted to improve detection of linker to include
pck embedding code in template builds.

dstoecker helped to improve the changed regex and gave hints for the implied
dangers regarding assumptions about the parsed string

---

diff -r -U 5 a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py
--- a/platform/linuxbsd/detect.py
+++ b/platform/linuxbsd/detect.py
@@ -463,16 +463,17 @@
         import re
 
         linker_version_str = subprocess.check_output(
             [env.subst(env["LINK"]), "-Wl,--version"] + env.subst(env["LINKFLAGS"])
         ).decode("utf-8")
-        gnu_ld_version = re.search(r"^GNU ld [^$]*(\d+\.\d+)$", linker_version_str, re.MULTILINE)
+        gnu_ld_version = re.search(r"^GNU ld $GNU Binutils[^)]*$ (\d+\.\d+)", linker_version_str, re.MULTILINE)
         if not gnu_ld_version:
             print(
                 "Warning: Creating export template binaries enabled for PCK embedding is currently only supported with GNU ld, not gold, LLD or mold."
             )
         else:
+            print("gnu_ld_version found by patch: " + str(gnu_ld_version.group(1)))
             if float(gnu_ld_version.group(1)) >= 2.30:
                 env.Append(LINKFLAGS=["-T", "platform/linuxbsd/pck_embed.ld"])
             else:
                 env.Append(LINKFLAGS=["-T", "platform/linuxbsd/pck_embed.legacy.ld"])

Places

File improve_linker_detection.patch of Package godot (Revision a1a957459019d46f29b1b4f8e8e804fb)

Places