gentoo auto-resync : 19:03:2023 - 06:33:49

2 files changed, 113 insertions, 63 deletions

diff --git a/dev-util/premake/files/premake-5.0.0-remove-hardcoded-libpath.patch b/dev-util/premake/files/premake-5.0.0-remove-hardcoded-libpath.patch
new file mode 100644
index 000000000000..4c7a377ba6c7
--- /dev/null
+++ b/dev-util/premake/files/premake-5.0.0-remove-hardcoded-libpath.patch
@@ -0,0 +1,113 @@
+Remove the hardcoded -L/usr/lib and -L/usr/lib64
+This is not needed, and will cause issues:
+https://github.com/gentoo/gentoo/pull/25825#issuecomment-1179497476
+Index: premake-core-5.0.0-beta2/modules/d/tools/dmd.lua
+===================================================================
+--- premake-core-5.0.0-beta2.orig/modules/d/tools/dmd.lua
++++ premake-core-5.0.0-beta2/modules/d/tools/dmd.lua
+@@ -52,8 +52,8 @@
+ 
+ 	tdmd.gcc.libraryDirectories = {
+ 		architecture = {
+-			x86 = "-L-L/usr/lib",
+-			x86_64 = "-L-L/usr/lib64",
++			x86 = "",
++			x86_64 = "",
+ 		}
+ 	}
+ 
+Index: premake-core-5.0.0-beta2/modules/d/tools/gdc.lua
+===================================================================
+--- premake-core-5.0.0-beta2.orig/modules/d/tools/gdc.lua
++++ premake-core-5.0.0-beta2/modules/d/tools/gdc.lua
+@@ -228,8 +228,8 @@
+ 
+ 	gdc.libraryDirectories = {
+ 		architecture = {
+-			x86 = "-L/usr/lib",
+-			x86_64 = "-L/usr/lib64",
++			x86 = "",
++			x86_64 = "",
+ 		}
+ 	}
+ 
+Index: premake-core-5.0.0-beta2/modules/d/tools/ldc.lua
+===================================================================
+--- premake-core-5.0.0-beta2.orig/modules/d/tools/ldc.lua
++++ premake-core-5.0.0-beta2/modules/d/tools/ldc.lua
+@@ -323,8 +323,8 @@
+ 
+ 	ldc.libraryDirectories = {
+ 		architecture = {
+-			x86 = "-L=-L/usr/lib",
+-			x86_64 = "-L=-L/usr/lib64",
++			x86 = "",
++			x86_64 = "",
+ 		}
+ 	}
+ 
+Index: premake-core-5.0.0-beta2/modules/gmake/tests/cpp/test_ldflags.lua
+===================================================================
+--- premake-core-5.0.0-beta2.orig/modules/gmake/tests/cpp/test_ldflags.lua
++++ premake-core-5.0.0-beta2/modules/gmake/tests/cpp/test_ldflags.lua
+@@ -55,7 +55,7 @@
+ 		system (p.LINUX)
+ 		prepare()
+ 		test.capture [[
+-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64
++  ALL_LDFLAGS += $(LDFLAGS) -m64
+ 		]]
+ 	end
+ 
+@@ -64,7 +64,7 @@
+ 		system (p.LINUX)
+ 		prepare()
+ 		test.capture [[
+-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32
++  ALL_LDFLAGS += $(LDFLAGS) -m32
+ 		]]
+ 	end
+ 
+Index: premake-core-5.0.0-beta2/modules/gmake2/tests/test_gmake2_ldflags.lua
+===================================================================
+--- premake-core-5.0.0-beta2.orig/modules/gmake2/tests/test_gmake2_ldflags.lua
++++ premake-core-5.0.0-beta2/modules/gmake2/tests/test_gmake2_ldflags.lua
+@@ -56,7 +56,7 @@ ALL_LDFLAGS += $(LDFLAGS) -L../libs -Lli
+ 		system (p.LINUX)
+ 		prepare()
+ 		test.capture [[
+-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64
++ALL_LDFLAGS += $(LDFLAGS) -m64
+ 		]]
+ 	end
+ 
+@@ -65,7 +65,7 @@ ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -
+ 		system (p.LINUX)
+ 		prepare()
+ 		test.capture [[
+-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32
++ALL_LDFLAGS += $(LDFLAGS) -m32
+ 		]]
+ 	end
+ 
+Index: premake-core-5.0.0-beta2/src/tools/gcc.lua
+===================================================================
+--- premake-core-5.0.0-beta2.orig/src/tools/gcc.lua
++++ premake-core-5.0.0-beta2/src/tools/gcc.lua
+@@ -477,16 +477,10 @@
+ 		architecture = {
+ 			x86 = function (cfg)
+ 				local r = {}
+-				if not table.contains(os.getSystemTags(cfg.system), "darwin") then
+-					table.insert (r, "-L/usr/lib32")
+-				end
+ 				return r
+ 			end,
+ 			x86_64 = function (cfg)
+ 				local r = {}
+-				if not table.contains(os.getSystemTags(cfg.system), "darwin") then
+-					table.insert (r, "-L/usr/lib64")
+-				end
+ 				return r
+ 			end,
+ 		},
diff --git a/dev-util/premake/files/premake-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch b/dev-util/premake/files/premake-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch
deleted file mode 100644
index 766d2aea71b4..000000000000
--- a/dev-util/premake/files/premake-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-https://bugs.gentoo.org/773505
-
-From 89d8c74f0c9ba77aaa12799a9d2dc397eac4ece6 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 15 Aug 2021 21:47:20 +0100
-Subject: [PATCH] Respect MAKEOPTS jobs
-
----
- Bootstrap.mak | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/Bootstrap.mak b/Bootstrap.mak
-index 06e0f20..2d59068 100644
---- a/Bootstrap.mak
-+++ b/Bootstrap.mak
-@@ -101,7 +101,7 @@ osx: osx-clean
- 	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_MACOSX -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" -framework CoreServices -framework Foundation -framework Security -lreadline $(SRC)
- 	./build/bootstrap/premake_bootstrap embed
- 	./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
--	$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)
-+	$(MAKE) -C build/bootstrap config=$(CONFIG)
- 
- linux-clean: nix-clean
- 
-@@ -110,7 +110,7 @@ linux: linux-clean
- 	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lm -ldl -lrt
- 	./build/bootstrap/premake_bootstrap embed
- 	./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
--	$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)
-+	$(MAKE) -C build/bootstrap config=$(CONFIG)
- 
- bsd-clean: nix-clean
- 
-@@ -119,7 +119,7 @@ bsd: bsd-clean
- 	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lm
- 	./build/bootstrap/premake_bootstrap embed
- 	./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
--	$(MAKE) -C build/bootstrap -j`getconf NPROCESSORS_ONLN` config=$(CONFIG)
-+	$(MAKE) -C build/bootstrap config=$(CONFIG)
- 
- solaris-clean: nix-clean
- 
-@@ -128,7 +128,7 @@ solaris: solaris-clean
- 	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lm
- 	./build/bootstrap/premake_bootstrap embed
- 	./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
--	$(MAKE) -C build/bootstrap -j`getconf NPROCESSORS_ONLN` config=$(CONFIG)
-+	$(MAKE) -C build/bootstrap config=$(CONFIG)
- 
- haiku-clean: nix-clean
- 
-@@ -137,7 +137,7 @@ haiku: haiku-clean
- 	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -D_BSD_SOURCE -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lbsd
- 	./build/bootstrap/premake_bootstrap embed
- 	./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
--	$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)
-+	$(MAKE) -C build/bootstrap config=$(CONFIG)
- 
- windows-base: windows-clean
- 	if not exist build\bootstrap (mkdir build\bootstrap)
--- 
-2.32.0
-