CVS commit: pkgsrc/devel/premake5

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/premake5
From: Frédéric Fauberteau <triaxx%netbsd.org@localhost>
Date: Tue, 13 May 2025 14:21:57 +0000

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Tue May 13 14:21:57 UTC 2025

Modified Files:
        pkgsrc/devel/premake5: Makefile distinfo
Added Files:
        pkgsrc/devel/premake5/patches:
            patch-modules_gmake_tests_test__gmake__ldflags.lua
            patch-modules_gmakelegacy_tests_cpp_test__ldflags.lua
            patch-src_host_premake.h patch-src_tools_gcc.lua
Removed Files:
        pkgsrc/devel/premake5/patches: patch-aa

Log Message:
premake5: Update to 5.0.0-beta6

pkgsrc changes:
---------------
  * Fix build on Darwin.
  * Split old patch-aa according to new mkpatches rules.

upstream changes:
-----------------
Since 5.0-beta5:
* PR #2405  Use git to retrieve version instead of manually change `PREMAKE_VERSION`. (@Jarod42)
* PR #2432  Usages and Uses API (@nickclark2016)
* PR #2438  Added more documentation for usages and uses (@nickclark2016)
* PR #2440  Add documentation specifying that filters are space sensitive (@nickclark2016)
* PR #2442  Fix findlib and findheader on windows (@Jarod42)
* PR #2443  nuget python package error fix (@hanagasira)
* PR #2446  Added Instrumented Profiling Support (@nickclark2016)
* PR #2449  [bugfix] Fix crash with invalid argument type passed to `os.locate` (@Jarod42)
* PR #2450  [contrib][premake] Add missing `"library/*.h"` in `files` in contrib/mbedtls/premake5.lua (@Jarod42)
* PR #2452  Update python version for requirements, upgrade jinja (@nickclark2016)

Since 5.0-beta4:
* PR #2401  [gmake] Add missing dependencies between prelink and generated files (@Jarod42)
* PR #2403  fix typo in xcode projects generator (@artamonovoleg)
* PR #2404  Rename gmake to gmakelegacy (@nickclark2016)
* PR #2406  Add OmniOS CI job (@LORgames)
* PR #2408  Rename gmake2 to gmake (@nickclark2016)
* PR #2412  Remove deprecated buildrule (@Jarod42)
* PR #2413  Improve some doc (@Jarod42)
* PR #2414  C23 dialect support (@nickclark2016)
* PR #2417  fix warnings function for the xcode4 generator (@artamonovoleg)
* PR #2419  Remove the 'Android' architecture from pre-vs2015 support (@redorav)
* PR #2422  Fix code using gmake2 to properly display warning (@nickclark2016)

Since 5.0-beta3:

* PR #2327  Removes deprecated language version flags (@nickclark2016)
* PR #2329  Use `_SC_NPROCESSORS_ONLN` for CPU detection in BSDs. (@tritao)
* PR #2331  Remove Deprecated Flags with Replacements, Fix Tests (@nickclark2016)
* PR #2333  Update package repos before installing deps on Linux (@nickclark2016)
* PR #2334  Replace MFC flag with a dedicated API (@nickclark2016)
* PR #2341  fix documentationfile bug (@lolrobbe2)
* PR #2342  Fix debug optimization flag for Clang (@nickclark2016)
* PR #2343  Replace LTO flag with dedicated API (@nickclark2016)
* PR #2347  Deprecate FatalWarnings flags in favor of fatalwarnings API (@nickclark2016)
* PR #2349  premake.h - added e2k definition (@r-a-sattarov)
* PR #2352  Symbolic link support in Premake (@nickclark2016)
* PR #2355  Added ability to use system zlib (@LORgames)
* PR #2356  Added support for riscv64 (@kxxt)
* PR #2357  Added API for Action Deprecation (@nickclark2016)
* PR #2358  Fixed creation of links on Unix-like OSes (@nickclark2016)
* PR #2359  Added FreeBSD CI job (@LORgames)
* PR #2360  Updated mbedTLS to 3.6.2 (@LORgames)
* PR #2361  Added Clang CI jobs to Linux and FreeBSD (@LORgames)
* PR #2362  Cleaned up minor issues in premake5.lua scripts (@LORgames)
* PR #2363  Add support for loongarch64 (@Leoforever123)
* PR #2364  Override Lua functions without injecting code into the library (@LORgames)
* PR #2366  Integrated Android module into vstudio module (@LORgames)
* PR #2367  Fixed potential use-after-free bug when calling os.getversion (@LORgames)
* PR #2368  Add SunOS support to Bootstrap.sh (@LORgames)
* PR #2369  Fix documentation for linkgroups (@nickclark2016)
* PR #2370  Add ability to use system lua (@LORgames)
* PR #2371  Add OpenBSD CI job (@LORgames)
* PR #2372  Add NetBSD CI job (@LORgames)
* PR #2373  Add DragonflyBSD CI job (@LORgames)
* PR #2374  Add Solaris CI job (@LORgames)
* PR #2375  Cleaned up VM-based CI jobs (@LORgames)
* PR #2376  Add Emscripten system and emcc toolset support (@tritao)
* PR #2378  Fixed configuration properties on VS Linux (@redorav)
* PR #2381  Fix gmake/gmake2 Emscripten default toolset type. (@tritao)
* PR #2382  Fatal warnings API fixes (@redorav)
* PR #2383  Added CI timeout to 30 minutes (@nickclark2016)
* PR #2385  Road to 5.0 Roadmap Publishing (@nickclark2016)
* PR #2388  Add support for e2k (@r-a-sattarov)
* PR #2390  [CI] Fix dependencies as ubuntu-latest becomes ubuntu-24.04 (@Jarod42)
* PR #2392  [CI] Add depsrc matrix to mingw build (@Jarod42)
* PR #2394  Bump jinja2 from 3.1.4 to 3.1.5 in /contrib/mbedtls/docs (@dependabot)
* PR #2395  Fix line endings of `Bootstrap.bat`. (@tritao)
* PR #2397  Fixes XCode Compiler C++ Version/Dialect Output (@nickclark2016)
* PR #2400  Fix token ordering for LINKFILE/LINKDIR (@nickclark2016)


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/premake5/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/premake5/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/premake5/patches/patch-aa
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/premake5/patches/patch-modules_gmake_tests_test__gmake__ldflags.lua \
    pkgsrc/devel/premake5/patches/patch-modules_gmakelegacy_tests_cpp_test__ldflags.lua \
    pkgsrc/devel/premake5/patches/patch-src_host_premake.h \
    pkgsrc/devel/premake5/patches/patch-src_tools_gcc.lua

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.12 pkgsrc/devel/premake5/Makefile:1.13
--- pkgsrc/devel/premake5/Makefile:1.12 Sat Apr 19 07:57:43 2025
+++ pkgsrc/devel/premake5/Makefile      Tue May 13 14:21:57 2025
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2025/04/19 07:57:43 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2025/05/13 14:21:57 triaxx Exp $
 
-PREMAKE5_VERSION=      5.0.0-beta2
+PREMAKE5_VERSION=      5.0.0-beta6
 DISTNAME=              premake-${PREMAKE5_VERSION}-src
 PKGNAME=               premake5-${PREMAKE5_VERSION:S/-beta2/.b2/}
-PKGREVISION=           10
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=premake/}
 GITHUB_PROJECT=                premake-core
@@ -16,7 +15,7 @@ COMMENT=              Build script generator
 LICENSE=               modified-bsd
 
 USE_TOOLS+=            gmake
-USE_LANGUAGES+=                c99
+USE_CC_FEATURES+=      c99
 
 BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:Q}
 
@@ -25,14 +24,7 @@ BUILDLINK_TRANSFORM+=        opt:-ldl:${BUILDLI
 DEPENDS+=              lua53-socket-[0-9]*:../../net/lua-socket
 
 .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
 BUILD_DIRS+=           build/bootstrap
-.endif
 
 INSTALLATION_DIRS=     bin
 
@@ -40,6 +32,11 @@ LDFLAGS+=            -lzip -L${BUILDLINK_PREFIX.li
 LDFLAGS+=              -lcurl -L${BUILDLINK_PREFIX.curl}/lib
 LDFLAGS+=              -lmbedtls -L${BUILDLINK_PREFIX.mbedtls3}/lib
 LDFLAGS+=              -lz -L${BUILDLINK_PREFIX.zlib}/lib
+LDFLAGS+=              -lm -ldl -luuid -llua
+LDFLAGS.Darwin+=       -framework CoreFoundation
+.if ${OPSYS} != "Darwin"
+LDFLAGS+=              -lrt
+.endif
 
 SUBST_CLASSES+=                mk
 SUBST_MESSAGE.mk=      Fixing build to link against system libs
@@ -91,23 +88,24 @@ do-configure:
        ${MKDIR} -p ${WRKSRC}/build/bootstrap
        cd ${WRKSRC} && \
                ${MAKE_ENV} ${CC} -o build/bootstrap/premake_bootstrap \
+               ${CFLAGS} \
                -DPREMAKE_NO_BUILTIN_SCRIPTS \
                ${BUNDLED_LUA_DEFINES} \
                -Icontrib/lua/src \
                -Icontrib/luashim \
                -I${BUILDLINK_PREFIX.libuuid}/include/uuid \
-               -L${PREFIX}/lib \
                src/host/*.c ${BUNDLED_LUA_SRC} \
-               -lm -ldl -lrt -luuid ${LDFLAGS} ${CFLAGS}
+               -L${PREFIX}/lib \
+               ${LDFLAGS}
        cd ${WRKSRC} && \
                ./build/bootstrap/premake_bootstrap embed
        cd ${WRKSRC} && \
                ./build/bootstrap/premake_bootstrap \
                --to=build/bootstrap \
-               --no-zlib \
-               --no-curl \
+               --zlib-src=none \
+               --curl-src=none \
                --no-luasocket \
-               gmake2
+               gmake
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/bin/release/premake5 \

Index: pkgsrc/devel/premake5/distinfo
diff -u pkgsrc/devel/premake5/distinfo:1.2 pkgsrc/devel/premake5/distinfo:1.3
--- pkgsrc/devel/premake5/distinfo:1.2  Mon May  8 22:37:31 2023
+++ pkgsrc/devel/premake5/distinfo      Tue May 13 14:21:57 2025
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.2 2023/05/08 22:37:31 nikita Exp $
+$NetBSD: distinfo,v 1.3 2025/05/13 14:21:57 triaxx 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
+BLAKE2s (premake-5.0.0-beta6-src.zip) = a56582ea0ac512a2fce010fa838b2c284c16ae13b9e71af9a35eb67da0281a6e
+SHA512 (premake-5.0.0-beta6-src.zip) = 55f560f90a0882e3bf07e498c3b43ce2e8424ba1c15f5085a26c63d94397dbe36cec91d71e88c9c74879d66c5343f91ee32af3ecb34f9dab02391561e8dda2fe
+Size (premake-5.0.0-beta6-src.zip) = 10622489 bytes
+SHA1 (patch-modules_gmake_tests_test__gmake__ldflags.lua) = 6c733297295b2d01ed7cd572a166d166bf9e16de
+SHA1 (patch-modules_gmakelegacy_tests_cpp_test__ldflags.lua) = c844137f75c3ca329c891301c526a820928d501f
+SHA1 (patch-src_host_premake.h) = 9d5da0ce882436d792543154550fa3ba6f8fb4bf
+SHA1 (patch-src_tools_gcc.lua) = 79f1c9c9c070d725532917b438ded2ee884bd590

Added files:

Index: pkgsrc/devel/premake5/patches/patch-modules_gmake_tests_test__gmake__ldflags.lua
diff -u /dev/null pkgsrc/devel/premake5/patches/patch-modules_gmake_tests_test__gmake__ldflags.lua:1.1
--- /dev/null   Tue May 13 14:21:57 2025
+++ pkgsrc/devel/premake5/patches/patch-modules_gmake_tests_test__gmake__ldflags.lua    Tue May 13 14:21:57 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-modules_gmake_tests_test__gmake__ldflags.lua,v 1.1 2025/05/13 14:21:57 triaxx 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/gmake/tests/test_gmake_ldflags.lua.orig    2022-09-03 20:03:02.000000000 +0000
++++ modules/gmake/tests/test_gmake_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: pkgsrc/devel/premake5/patches/patch-modules_gmakelegacy_tests_cpp_test__ldflags.lua
diff -u /dev/null pkgsrc/devel/premake5/patches/patch-modules_gmakelegacy_tests_cpp_test__ldflags.lua:1.1
--- /dev/null   Tue May 13 14:21:57 2025
+++ pkgsrc/devel/premake5/patches/patch-modules_gmakelegacy_tests_cpp_test__ldflags.lua Tue May 13 14:21:57 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-modules_gmakelegacy_tests_cpp_test__ldflags.lua,v 1.1 2025/05/13 14:21:57 triaxx 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/gmakelegacy/tests/cpp/test_ldflags.lua.orig        2022-09-03 20:03:02.000000000 +0000
++++ modules/gmakelegacy/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: pkgsrc/devel/premake5/patches/patch-src_host_premake.h
diff -u /dev/null pkgsrc/devel/premake5/patches/patch-src_host_premake.h:1.1
--- /dev/null   Tue May 13 14:21:57 2025
+++ pkgsrc/devel/premake5/patches/patch-src_host_premake.h      Tue May 13 14:21:57 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_host_premake.h,v 1.1 2025/05/13 14:21:57 triaxx Exp $
+
+Fix header paths to be consistent with include directories provided by pkgsrc.
+
+--- src/host/premake.h.orig    2025-05-13 13:51:10.681237075 +0000
++++ src/host/premake.h
+@@ -10,9 +10,9 @@
+ #include "lauxlib.h"
+ #include "lualib.h"
+ #else
+-#include <lua5.3/lua.h>
+-#include <lua5.3/lauxlib.h>
+-#include <lua5.3/lualib.h>
++#include <lua.h>
++#include <lauxlib.h>
++#include <lualib.h>
+ #endif
+ 
+ #include <stdint.h>
Index: pkgsrc/devel/premake5/patches/patch-src_tools_gcc.lua
diff -u /dev/null pkgsrc/devel/premake5/patches/patch-src_tools_gcc.lua:1.1
--- /dev/null   Tue May 13 14:21:57 2025
+++ pkgsrc/devel/premake5/patches/patch-src_tools_gcc.lua       Tue May 13 14:21:57 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_tools_gcc.lua,v 1.1 2025/05/13 14:21:57 triaxx 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
+
+--- src/tools/gcc.lua.orig     2022-09-03 20:03:02.000000000 +0000
++++ src/tools/gcc.lua
+@@ -536,16 +536,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,
+               },

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index