1 |
commit: a71f049b4729191d5d0f796211a063ef575c3364 |
2 |
Author: YiyangWu <xgreenlandforwyy <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Jun 9 07:30:13 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 19 04:22:13 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a71f049b |
7 |
|
8 |
dev-util/premake: bump version, remove hard-coded -L/usr/lib64 |
9 |
|
10 |
Currrently premake hardcoded -L/usr/lib64 as LDFLAG on linux 64 bit |
11 |
platform, and -L/usr/lib for 32 bit. This should be removed. This also |
12 |
benefits running premake on Gentoo prefix. |
13 |
|
14 |
Test on Gentoo prefix: |
15 |
|
16 |
[==========] 2137 tests from 191 test suites ran. (1558 ms total) |
17 |
[ PASSED ] 2137 tests. |
18 |
|
19 |
Signed-off-by: YiyangWu <xgreenlandforwyy <AT> gmail.com> |
20 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
21 |
|
22 |
dev-util/premake/Manifest | 2 +- |
23 |
.../premake-5.0.0-remove-hardcoded-libpath.patch | 113 +++++++++++++++++++++ |
24 |
...emake-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch | 63 ------------ |
25 |
...0_alpha16.ebuild => premake-5.0.0_beta2.ebuild} | 6 +- |
26 |
4 files changed, 116 insertions(+), 68 deletions(-) |
27 |
|
28 |
diff --git a/dev-util/premake/Manifest b/dev-util/premake/Manifest |
29 |
index 7ed7cd054ada..afe7721bf87c 100644 |
30 |
--- a/dev-util/premake/Manifest |
31 |
+++ b/dev-util/premake/Manifest |
32 |
@@ -1,4 +1,4 @@ |
33 |
DIST premake-4.3-src.zip 514366 BLAKE2B 5079f9d7c5dbe46d60149ec7c01523eaca5ab3cccce9f2f66d05905152ceb0b8bddaf181624288b722dd1534da6aef256ed5bb997db448f1499c8ab989277bc6 SHA512 df3a4f1e04afb6ae9acf06c063b084a4bcc7c48a98eebeb242eafef40de4097c6a6fe549369d9538b93efea35244222b9d26c15824f126a67b8f80abaecdf001 |
34 |
DIST premake-4.4-beta5-src.zip 596883 BLAKE2B f4bf2b75946b6a442aced79f1f29b08e61bfa34c1e30c64aa59a6fed9c4c35aaca996fd0e8b728e839c24e74eae9f23ac3c99406361a061f0fa5dc04ce3ce9aa SHA512 47a2c26d3c45578cb2cbae96ec1b647298824d08584e2610aacd038e21069297a1f5b3366340cf781d29827555ff4d955651f70cdc2d36b99808fddf52e7a242 |
35 |
-DIST premake-5.0.0_alpha16.tar.gz 6462956 BLAKE2B 27c27eeef77986f6e8244ecd1a08e19d753dafcd0292d593ac758e04c2cb2307e05aaf325d2afc6ad8936ab2bbd97af6269841b9b7489b50dd4ce56e39120f05 SHA512 7ddb5ffe48484157336c7309fb611d34ff670fb20f92da309af3a4ae6f664a4b8abd2c0575036abbed1e346b155a03bf6fbac0587b47d5c97d9a22f08dd2deea |
36 |
+DIST premake-5.0.0_beta2.tar.gz 6491805 BLAKE2B 1e5245ded3c36b61afd9339351ae2250cebd488a3723c1844b98a8bcf257a3a33102483d5b830a264aff7371b40edcac7dca18dbaacb0dffeb6e43d69e5d6a4c SHA512 0385e2859ed8873f78e2e8e4a57112c9ec5ff5ef6c456caa7a96b9fc372f148cec9c745e19cac7daee6c55820e86e55224737aa172e2134c169303829c1080eb |
37 |
DIST premake-src-3.7.zip 427727 BLAKE2B 2f9cc7b045f75ceb52a8e71507cb5576f042a93be4f6c097e8bc1166e3bbb9e271a02f5fbd648f79e0d24867a09bba9ac72a268fdc47140219c5d6a36cda1a16 SHA512 351b26b9ee738e97b1828e7c26fe1538fb1509fbdc030da3d87fc28b1daa7966bc50ba8043062d35b37fa3929d909533b723241e1f98e438a039c6f9d61a46f4 |
38 |
|
39 |
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 |
40 |
new file mode 100644 |
41 |
index 000000000000..4c7a377ba6c7 |
42 |
--- /dev/null |
43 |
+++ b/dev-util/premake/files/premake-5.0.0-remove-hardcoded-libpath.patch |
44 |
@@ -0,0 +1,113 @@ |
45 |
+Remove the hardcoded -L/usr/lib and -L/usr/lib64 |
46 |
+This is not needed, and will cause issues: |
47 |
+https://github.com/gentoo/gentoo/pull/25825#issuecomment-1179497476 |
48 |
+Index: premake-core-5.0.0-beta2/modules/d/tools/dmd.lua |
49 |
+=================================================================== |
50 |
+--- premake-core-5.0.0-beta2.orig/modules/d/tools/dmd.lua |
51 |
++++ premake-core-5.0.0-beta2/modules/d/tools/dmd.lua |
52 |
+@@ -52,8 +52,8 @@ |
53 |
+ |
54 |
+ tdmd.gcc.libraryDirectories = { |
55 |
+ architecture = { |
56 |
+- x86 = "-L-L/usr/lib", |
57 |
+- x86_64 = "-L-L/usr/lib64", |
58 |
++ x86 = "", |
59 |
++ x86_64 = "", |
60 |
+ } |
61 |
+ } |
62 |
+ |
63 |
+Index: premake-core-5.0.0-beta2/modules/d/tools/gdc.lua |
64 |
+=================================================================== |
65 |
+--- premake-core-5.0.0-beta2.orig/modules/d/tools/gdc.lua |
66 |
++++ premake-core-5.0.0-beta2/modules/d/tools/gdc.lua |
67 |
+@@ -228,8 +228,8 @@ |
68 |
+ |
69 |
+ gdc.libraryDirectories = { |
70 |
+ architecture = { |
71 |
+- x86 = "-L/usr/lib", |
72 |
+- x86_64 = "-L/usr/lib64", |
73 |
++ x86 = "", |
74 |
++ x86_64 = "", |
75 |
+ } |
76 |
+ } |
77 |
+ |
78 |
+Index: premake-core-5.0.0-beta2/modules/d/tools/ldc.lua |
79 |
+=================================================================== |
80 |
+--- premake-core-5.0.0-beta2.orig/modules/d/tools/ldc.lua |
81 |
++++ premake-core-5.0.0-beta2/modules/d/tools/ldc.lua |
82 |
+@@ -323,8 +323,8 @@ |
83 |
+ |
84 |
+ ldc.libraryDirectories = { |
85 |
+ architecture = { |
86 |
+- x86 = "-L=-L/usr/lib", |
87 |
+- x86_64 = "-L=-L/usr/lib64", |
88 |
++ x86 = "", |
89 |
++ x86_64 = "", |
90 |
+ } |
91 |
+ } |
92 |
+ |
93 |
+Index: premake-core-5.0.0-beta2/modules/gmake/tests/cpp/test_ldflags.lua |
94 |
+=================================================================== |
95 |
+--- premake-core-5.0.0-beta2.orig/modules/gmake/tests/cpp/test_ldflags.lua |
96 |
++++ premake-core-5.0.0-beta2/modules/gmake/tests/cpp/test_ldflags.lua |
97 |
+@@ -55,7 +55,7 @@ |
98 |
+ system (p.LINUX) |
99 |
+ prepare() |
100 |
+ test.capture [[ |
101 |
+- ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 |
102 |
++ ALL_LDFLAGS += $(LDFLAGS) -m64 |
103 |
+ ]] |
104 |
+ end |
105 |
+ |
106 |
+@@ -64,7 +64,7 @@ |
107 |
+ system (p.LINUX) |
108 |
+ prepare() |
109 |
+ test.capture [[ |
110 |
+- ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32 |
111 |
++ ALL_LDFLAGS += $(LDFLAGS) -m32 |
112 |
+ ]] |
113 |
+ end |
114 |
+ |
115 |
+Index: premake-core-5.0.0-beta2/modules/gmake2/tests/test_gmake2_ldflags.lua |
116 |
+=================================================================== |
117 |
+--- premake-core-5.0.0-beta2.orig/modules/gmake2/tests/test_gmake2_ldflags.lua |
118 |
++++ premake-core-5.0.0-beta2/modules/gmake2/tests/test_gmake2_ldflags.lua |
119 |
+@@ -56,7 +56,7 @@ ALL_LDFLAGS += $(LDFLAGS) -L../libs -Lli |
120 |
+ system (p.LINUX) |
121 |
+ prepare() |
122 |
+ test.capture [[ |
123 |
+-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 |
124 |
++ALL_LDFLAGS += $(LDFLAGS) -m64 |
125 |
+ ]] |
126 |
+ end |
127 |
+ |
128 |
+@@ -65,7 +65,7 @@ ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 - |
129 |
+ system (p.LINUX) |
130 |
+ prepare() |
131 |
+ test.capture [[ |
132 |
+-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32 |
133 |
++ALL_LDFLAGS += $(LDFLAGS) -m32 |
134 |
+ ]] |
135 |
+ end |
136 |
+ |
137 |
+Index: premake-core-5.0.0-beta2/src/tools/gcc.lua |
138 |
+=================================================================== |
139 |
+--- premake-core-5.0.0-beta2.orig/src/tools/gcc.lua |
140 |
++++ premake-core-5.0.0-beta2/src/tools/gcc.lua |
141 |
+@@ -477,16 +477,10 @@ |
142 |
+ architecture = { |
143 |
+ x86 = function (cfg) |
144 |
+ local r = {} |
145 |
+- if not table.contains(os.getSystemTags(cfg.system), "darwin") then |
146 |
+- table.insert (r, "-L/usr/lib32") |
147 |
+- end |
148 |
+ return r |
149 |
+ end, |
150 |
+ x86_64 = function (cfg) |
151 |
+ local r = {} |
152 |
+- if not table.contains(os.getSystemTags(cfg.system), "darwin") then |
153 |
+- table.insert (r, "-L/usr/lib64") |
154 |
+- end |
155 |
+ return r |
156 |
+ end, |
157 |
+ }, |
158 |
|
159 |
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 |
160 |
deleted file mode 100644 |
161 |
index 766d2aea71b4..000000000000 |
162 |
--- a/dev-util/premake/files/premake-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch |
163 |
+++ /dev/null |
164 |
@@ -1,63 +0,0 @@ |
165 |
-https://bugs.gentoo.org/773505 |
166 |
- |
167 |
-From 89d8c74f0c9ba77aaa12799a9d2dc397eac4ece6 Mon Sep 17 00:00:00 2001 |
168 |
-From: Sam James <sam@g.o> |
169 |
-Date: Sun, 15 Aug 2021 21:47:20 +0100 |
170 |
-Subject: [PATCH] Respect MAKEOPTS jobs |
171 |
- |
172 |
---- |
173 |
- Bootstrap.mak | 10 +++++----- |
174 |
- 1 file changed, 5 insertions(+), 5 deletions(-) |
175 |
- |
176 |
-diff --git a/Bootstrap.mak b/Bootstrap.mak |
177 |
-index 06e0f20..2d59068 100644 |
178 |
---- a/Bootstrap.mak |
179 |
-+++ b/Bootstrap.mak |
180 |
-@@ -101,7 +101,7 @@ osx: osx-clean |
181 |
- $(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) |
182 |
- ./build/bootstrap/premake_bootstrap embed |
183 |
- ./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2 |
184 |
-- $(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG) |
185 |
-+ $(MAKE) -C build/bootstrap config=$(CONFIG) |
186 |
- |
187 |
- linux-clean: nix-clean |
188 |
- |
189 |
-@@ -110,7 +110,7 @@ linux: linux-clean |
190 |
- $(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 |
191 |
- ./build/bootstrap/premake_bootstrap embed |
192 |
- ./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2 |
193 |
-- $(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG) |
194 |
-+ $(MAKE) -C build/bootstrap config=$(CONFIG) |
195 |
- |
196 |
- bsd-clean: nix-clean |
197 |
- |
198 |
-@@ -119,7 +119,7 @@ bsd: bsd-clean |
199 |
- $(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lm |
200 |
- ./build/bootstrap/premake_bootstrap embed |
201 |
- ./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2 |
202 |
-- $(MAKE) -C build/bootstrap -j`getconf NPROCESSORS_ONLN` config=$(CONFIG) |
203 |
-+ $(MAKE) -C build/bootstrap config=$(CONFIG) |
204 |
- |
205 |
- solaris-clean: nix-clean |
206 |
- |
207 |
-@@ -128,7 +128,7 @@ solaris: solaris-clean |
208 |
- $(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lm |
209 |
- ./build/bootstrap/premake_bootstrap embed |
210 |
- ./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2 |
211 |
-- $(MAKE) -C build/bootstrap -j`getconf NPROCESSORS_ONLN` config=$(CONFIG) |
212 |
-+ $(MAKE) -C build/bootstrap config=$(CONFIG) |
213 |
- |
214 |
- haiku-clean: nix-clean |
215 |
- |
216 |
-@@ -137,7 +137,7 @@ haiku: haiku-clean |
217 |
- $(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 |
218 |
- ./build/bootstrap/premake_bootstrap embed |
219 |
- ./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2 |
220 |
-- $(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG) |
221 |
-+ $(MAKE) -C build/bootstrap config=$(CONFIG) |
222 |
- |
223 |
- windows-base: windows-clean |
224 |
- if not exist build\bootstrap (mkdir build\bootstrap) |
225 |
--- |
226 |
-2.32.0 |
227 |
- |
228 |
|
229 |
diff --git a/dev-util/premake/premake-5.0.0_alpha16.ebuild b/dev-util/premake/premake-5.0.0_beta2.ebuild |
230 |
similarity index 83% |
231 |
rename from dev-util/premake/premake-5.0.0_alpha16.ebuild |
232 |
rename to dev-util/premake/premake-5.0.0_beta2.ebuild |
233 |
index eea76fb7ca0e..56b499a53419 100644 |
234 |
--- a/dev-util/premake/premake-5.0.0_alpha16.ebuild |
235 |
+++ b/dev-util/premake/premake-5.0.0_beta2.ebuild |
236 |
@@ -1,4 +1,4 @@ |
237 |
-# Copyright 1999-2021 Gentoo Authors |
238 |
+# Copyright 1999-2023 Gentoo Authors |
239 |
# Distributed under the terms of the GNU General Public License v2 |
240 |
|
241 |
EAPI=8 |
242 |
@@ -16,9 +16,7 @@ LICENSE="BSD" |
243 |
SLOT="5" |
244 |
KEYWORDS="~amd64 ~arm64 ~ppc ~x86" |
245 |
|
246 |
-PATCHES=( |
247 |
- "${FILESDIR}"/${PN}-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch |
248 |
-) |
249 |
+PATCHES=( "${FILESDIR}/${PN}-5.0.0-remove-hardcoded-libpath.patch" ) |
250 |
|
251 |
src_compile() { |
252 |
# bug #773505 |