From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 7 Sep 2021 08:50:57 +0000 (+0100)
Subject: Link with libatomic.
X-Git-Tag: archive/raspbian/0.0.25b-1.1+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e719c6377ebd2e82a84184f0f71a279c7f8a2c94;p=0ad.git

Link with libatomic.

Last-Update: 2021-09-07


Gbp-Pq: Name link-libatomic.patch
---

diff --git a/build/premake/premake5.lua b/build/premake/premake5.lua
index 2cf95a3..38104e2 100644
--- a/build/premake/premake5.lua
+++ b/build/premake/premake5.lua
@@ -1062,6 +1062,7 @@ function setup_main_exe ()
 			links {
 				-- Dynamic libraries (needed for linking for gold)
 				"dl",
+				"atomic",
 			}
 		end
 
@@ -1261,6 +1262,7 @@ function setup_collada_project(project_name, target_type, rel_source_dirs, rel_i
 
 		links {
 			"dl",
+			"atomic",
 		}
 
 		-- FCollada is not aliasing-safe, so disallow dangerous optimisations
@@ -1279,6 +1281,7 @@ function setup_collada_project(project_name, target_type, rel_source_dirs, rel_i
 		if os.getversion().description == "GNU/kFreeBSD" then
 			links {
 				"dl",
+				"atomic",
 			}
 		end
 
@@ -1423,6 +1426,7 @@ function setup_tests()
 			links {
 				-- Dynamic libraries (needed for linking for gold)
 				"dl",
+				"atomic",
 			}
 		end
 
diff --git a/build/premake/premake5/build/gmake2.unix/Premake5.make b/build/premake/premake5/build/gmake2.unix/Premake5.make
index dbb8cdc..e21148c 100644
--- a/build/premake/premake5/build/gmake2.unix/Premake5.make
+++ b/build/premake/premake5/build/gmake2.unix/Premake5.make
@@ -38,7 +38,7 @@ OBJDIR = obj/Release/Premake5
 DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra
 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra -fno-stack-protector
-LIBS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a -lm -ldl -lrt
+LIBS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a -lm -ldl -lrt -latomic
 LDDEPS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a
 ALL_LDFLAGS += $(LDFLAGS) -s -rdynamic
 
@@ -49,7 +49,7 @@ OBJDIR = obj/Debug/Premake5
 DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra
 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra
-LIBS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a bin/Debug/libmbedtls-lib.a -lm -ldl -lrt
+LIBS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a bin/Debug/libmbedtls-lib.a -lm -ldl -lrt -latomic
 LDDEPS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a bin/Debug/libmbedtls-lib.a
 ALL_LDFLAGS += $(LDFLAGS) -rdynamic