Date: Mon, 18 Nov 2024 00:58:49 GMT From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 42f8aa523e75 - main - devel/premake5: update to 5.0.0-beta3 Message-ID: <202411180058.4AI0wnAS042791@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=42f8aa523e750a8b5917f87fb014bd43b8579022 commit 42f8aa523e750a8b5917f87fb014bd43b8579022 Author: Charlie Root <root@hades.lan> AuthorDate: 2024-11-14 13:15:01 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2024-11-18 00:57:53 +0000 devel/premake5: update to 5.0.0-beta3 - add patch for upstream isue #2328 Changelog: https://github.com/premake/premake-core/releases/tag/v5.0.0-beta3 PR: 282757 See also: https://github.com/premake/premake-core/issues/2328 --- devel/premake5/Makefile | 4 +-- devel/premake5/distinfo | 6 ++-- .../premake5/files/patch-src_host_os__getnumcpus.c | 33 ++++++++++++++++++++++ devel/premake5/files/patch-tests___tests.lua | 4 +-- 4 files changed, 40 insertions(+), 7 deletions(-) diff --git a/devel/premake5/Makefile b/devel/premake5/Makefile index 7461ee6c2217..a58e98b29d9a 100644 --- a/devel/premake5/Makefile +++ b/devel/premake5/Makefile @@ -1,6 +1,6 @@ PORTNAME= premake DISTVERSIONPREFIX= v -DISTVERSION= 5.0.0-beta2 +DISTVERSION= 5.0.0-beta3 CATEGORIES= devel MASTER_SITES= https://github.com/premake/premake-core/releases/download/${DISTVERSIONFULL}/ PKGNAMESUFFIX= 5 @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt ONLY_FOR_ARCHS= aarch64 amd64 armv7 i386 powerpc powerpc64 powerpc64le USES= dos2unix gmake zip -DOS2UNIX_FILES= tests/_tests.lua tests/test +DOS2UNIX_FILES= tests/_tests.lua tests/test src/host/*.c MAKEFILE= Bootstrap.mak MAKE_ARGS= CC="${CC}" \ diff --git a/devel/premake5/distinfo b/devel/premake5/distinfo index f59b990fe6cd..04e59375b6e6 100644 --- a/devel/premake5/distinfo +++ b/devel/premake5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664396354 -SHA256 (premake-5.0.0-beta2-src.zip) = 4c1100f5170ae1c3bd1b4fd9458b3b02ae841aefbfc41514887b80996436dee2 -SIZE (premake-5.0.0-beta2-src.zip) = 8867376 +TIMESTAMP = 1731588609 +SHA256 (premake-5.0.0-beta3-src.zip) = 4b2b1fe9772ca1caf689c07e8c32f108b8393922956f602ddaf404f73467bd83 +SIZE (premake-5.0.0-beta3-src.zip) = 9317028 diff --git a/devel/premake5/files/patch-src_host_os__getnumcpus.c b/devel/premake5/files/patch-src_host_os__getnumcpus.c new file mode 100644 index 000000000000..9a730c72434d --- /dev/null +++ b/devel/premake5/files/patch-src_host_os__getnumcpus.c @@ -0,0 +1,33 @@ +--- src/host/os_getnumcpus.c.orig 2024-11-14 13:12:15 UTC ++++ src/host/os_getnumcpus.c +@@ -46,29 +46,8 @@ int do_getnumcpus() + { + return 0; + } +-#elif PLATFORM_SOLARIS | PLATFORM_AIX | PLATFORM_MACOSX ++#elif PLATFORM_SOLARIS | PLATFORM_AIX | PLATFORM_MACOSX | PLATFORM_BSD + return sysconf(_SC_NPROCESSORS_ONLN); +-#elif PLATFORM_BSD +- int mib[4]; +- int numCPU; +- size_t len = sizeof(numCPU); +- +- /* set the mib for hw.ncpu */ +- mib[0] = CTL_HW; +- mib[1] = HW_AVAILCPU; // alternatively, try HW_NCPU; +- +- /* get the number of CPUs from the system */ +- sysctl(mib, 2, &numCPU, &len, NULL, 0); +- +- if (numCPU < 1) +- { +- mib[1] = HW_NCPU; +- sysctl(mib, 2, &numCPU, &len, NULL, 0); +- if (numCPU < 1) +- return 0; +- } +- +- return numCPU; + #else + #warning do_getnumcpus is not implemented for your platform yet + return 0; diff --git a/devel/premake5/files/patch-tests___tests.lua b/devel/premake5/files/patch-tests___tests.lua index e9a23a940694..ad92e291e953 100644 --- a/devel/premake5/files/patch-tests___tests.lua +++ b/devel/premake5/files/patch-tests___tests.lua @@ -1,6 +1,6 @@ ---- tests/_tests.lua.orig 2022-09-28 21:00:51 UTC +--- tests/_tests.lua.orig 2024-11-14 12:50:13 UTC +++ tests/_tests.lua -@@ -60,8 +60,8 @@ return { +@@ -62,8 +62,8 @@ return { "base/test_validation.lua", -- -- Toolset tests
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411180058.4AI0wnAS042791>