CVS commit: pkgsrc/devel/premake5

["Nikita" <nikita%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nikita
Date:           Mon May  8 22:37:32 UTC 2023

Modified Files:
        pkgsrc/devel/premake5: Makefile distinfo
Added Files:
        pkgsrc/devel/premake5/patches: patch-aa

Log Message:
premake5: hopefully fix build on Darwin by using the other makefiles directory.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/premake5/Makefile \
    pkgsrc/devel/premake5/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/premake5/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/premake5/Makefile
diff -u pkgsrc/devel/premake5/Makefile:1.1 pkgsrc/devel/premake5/Makefile:1.2
--- pkgsrc/devel/premake5/Makefile:1.1  Wed May  3 17:43:00 2023
+++ pkgsrc/devel/premake5/Makefile      Mon May  8 22:37:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2023/05/03 17:43:00 nikita Exp $
+# $NetBSD: Makefile,v 1.2 2023/05/08 22:37:31 nikita Exp $
 
 PREMAKE5_VERSION=      5.0.0-beta2
 DISTNAME=              premake-${PREMAKE5_VERSION}-src
@@ -18,7 +18,14 @@ USE_TOOLS+=          gmake
 
 BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:Q}
 
+.include "../../mk/bsd.prefs.mk"
+# maybe fix the build on Darwin.
+# if this doesn't work, we need to patch what's in build/gmake2.unix
+.if ${OPSYS} == "Darwin"
+BUILD_DIRS+=           build/gmake2.macosx
+.else
 BUILD_DIRS+=           build/gmake2.unix
+.endif
 
 INSTALLATION_DIRS=     bin
 
Index: pkgsrc/devel/premake5/distinfo
diff -u pkgsrc/devel/premake5/distinfo:1.1 pkgsrc/devel/premake5/distinfo:1.2
--- pkgsrc/devel/premake5/distinfo:1.1  Wed May  3 17:43:00 2023
+++ pkgsrc/devel/premake5/distinfo      Mon May  8 22:37:31 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2023/05/03 17:43:00 nikita Exp $
+$NetBSD: distinfo,v 1.2 2023/05/08 22:37:31 nikita Exp $
 
 BLAKE2s (premake-5.0.0-beta2-src.zip) = 906465840c8d8c2b6705a5745963d0f1fe6efbeb4a0f67e765fac827e3082adf
 SHA512 (premake-5.0.0-beta2-src.zip) = 6913293aa29c2bfd2ac07ed40210da2f6b0ed853f3a24dcf66715748647a12502defb96ba3591a5e0515a808c5ea7013c41e29c3d18bb715d336c72a9bd151e3
 Size (premake-5.0.0-beta2-src.zip) = 8867376 bytes
+SHA1 (patch-aa) = 5623b2f798570ae1de00be6a86b8ef92857e8722

Added files:

Index: pkgsrc/devel/premake5/patches/patch-aa
diff -u /dev/null pkgsrc/devel/premake5/patches/patch-aa:1.1
--- /dev/null   Mon May  8 22:37:32 2023
+++ pkgsrc/devel/premake5/patches/patch-aa      Mon May  8 22:37:31 2023
@@ -0,0 +1,104 @@
+$NetBSD: patch-aa,v 1.1 2023/05/08 22:37:31 nikita Exp $
+
+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
+
+--- modules/d/tools/dmd.lua
++++ 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 = "",
+               }
+       }
+ 
+--- modules/d/tools/gdc.lua
++++ modules/d/tools/gdc.lua
+@@ -228,8 +228,8 @@
+ 
+       gdc.libraryDirectories = {
+               architecture = {
+-                      x86 = "-L/usr/lib",
+-                      x86_64 = "-L/usr/lib64",
++                      x86 = "",
++                      x86_64 = "",
+               }
+       }
+ 
+--- modules/d/tools/ldc.lua
++++ 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 = "",
+               }
+       }
+ 
+--- modules/gmake/tests/cpp/test_ldflags.lua
++++ 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
+ 
+--- modules/gmake2/tests/test_gmake2_ldflags.lua
++++ 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
+ 
+--- src/tools/gcc.lua
++++ 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,
+               },