forked from pool/godot
cc0af50653
Update to 3.3 OBS-URL: https://build.opensuse.org/request/show/887901 OBS-URL: https://build.opensuse.org/package/show/games/godot?expand=0&rev=22
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From: cunix@mail.de
|
|
Date: 2020-02-12 12:00:00
|
|
Subject: linker should use "-pie" instead of "-no-pie"
|
|
References: https://github.com/godotengine/godot/pull/23542#issuecomment-436385853
|
|
https://github.com/godotengine/godot/pull/23542
|
|
https://github.com/godotengine/godot/issues/34533
|
|
Upstream: seems to do the opposite
|
|
Rebased: 2021-04-22
|
|
|
|
Linker flag "-no-pie" is added by upstream.
|
|
rpmlint complains this violates project policy.
|
|
Patch replaces flag "-no-pie" with "-pie".
|
|
|
|
---
|
|
|
|
diff -r -U 5 a/platform/x11/detect.py b/platform/x11/detect.py
|
|
--- a/platform/x11/detect.py
|
|
+++ b/platform/x11/detect.py
|
|
@@ -199,11 +199,11 @@
|
|
# Check for gcc version >= 6 before adding -no-pie
|
|
version = get_compiler_version(env) or [-1, -1]
|
|
if using_gcc(env):
|
|
if version[0] >= 6:
|
|
env.Append(CCFLAGS=["-fpie"])
|
|
- env.Append(LINKFLAGS=["-no-pie"])
|
|
+ env.Append(LINKFLAGS=["-pie"])
|
|
# Do the same for clang should be fine with Clang 4 and higher
|
|
if using_clang(env):
|
|
if version[0] >= 4:
|
|
env.Append(CCFLAGS=["-fpie"])
|
|
env.Append(LINKFLAGS=["-no-pie"])
|