Date: Mon, 02 Feb 2026 18:28:01 +0000 From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 614cec67767c - main - devel/kBuild: Update 0.1.9998r3660 => 0.1.9998r3687, fix build with GCC 15 Message-ID: <6980ecb1.25d69.4fac2852@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=614cec67767cb8afb47cfd290d17dbd812a7386e commit 614cec67767cb8afb47cfd290d17dbd812a7386e Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2026-02-02 18:17:20 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2026-02-02 18:27:56 +0000 devel/kBuild: Update 0.1.9998r3660 => 0.1.9998r3687, fix build with GCC 15 Commit log: https://trac.netlabs.org/kbuild/changeset?reponame=&new=3687%40trunk&old=3660%40trunk PR: 292692 292801 --- devel/kBuild/Makefile | 31 ++++++++++-------------- devel/kBuild/distinfo | 6 ++--- devel/kBuild/files/patch-src_kmk_getopt.h | 11 +++++++++ devel/kBuild/files/patch-src_kmk_glob_fnmatch.c | 11 +++++++++ devel/kBuild/files/patch-src_oldsed_lib_getopt.h | 11 +++++++++ devel/kBuild/pkg-plist | 2 ++ 6 files changed, 51 insertions(+), 21 deletions(-) diff --git a/devel/kBuild/Makefile b/devel/kBuild/Makefile index b6791172e226..c8efd2579a83 100644 --- a/devel/kBuild/Makefile +++ b/devel/kBuild/Makefile @@ -1,9 +1,9 @@ PORTNAME= kBuild DISTVERSION= ${KBUILD_VERSION} -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= devel MASTER_SITES= LOCAL/vvd -DISTNAME= ${PORTNAME}-${DISTVERSION}r3660-src +DISTNAME= ${PORTNAME}-${DISTVERSION}r3687 MAINTAINER= vbox@FreeBSD.org COMMENT= Makefile framework @@ -14,10 +14,6 @@ LICENSE_COMB= multi USES= autoreconf:build gmake makeinfo tar:xz -CONFLICTS_INSTALL= kBuild-devel - -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} - KBUILD_VERSION= 0.1.9998 KBUILD_ARCH= ${MACHINE_ARCH:S/aarch64/arm64/:S/i386/x86/:S/x86_64/amd64/:C/powerpc64.*/ppc64/:C/powerpc.*/ppc32/:C/armv.*/arm32/} KBUILD_ENV= AUTORECONF=${AUTORECONF} \ @@ -46,22 +42,21 @@ post-patch: @${REINPLACE_CMD} 's|gcc|${CC}|g' ${WRKSRC}/kBuild/tools/*.kmk do-build: - cd ${WRKSRC} && ${SETENV} ${KBUILD_ENV} ./kBuild/env.sh --full ${MAKE_CMD} -f bootstrap.gmk - cd ${WRKSRC} && ${RM} -r out - cd ${WRKSRC} && ./kBuild/env.sh kmk - cd ${WRKSRC} && ./kBuild/env.sh kmk NIX_INSTALL_DIR=${PREFIX} BUILD_TYPE=release -C ${WRKSRC} + (cd ${WRKSRC} && \ + ${SETENV} ${KBUILD_ENV} ./kBuild/env.sh --full ${MAKE_CMD} -f bootstrap.gmk && \ + ${RM} -r out && \ + ./kBuild/env.sh kmk && \ + ./kBuild/env.sh kmk NIX_INSTALL_DIR=${PREFIX} BUILD_TYPE=release -C ${WRKSRC}) do-install: -.for bin in ${KBUILD_BINS} - ${INSTALL_PROGRAM} ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/bin/${bin} ${STAGEDIR}${PREFIX}/bin -.endfor - ${MKDIR} ${STAGEDIR}${DATADIR} - (cd ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/share/kBuild && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}) + (cd ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/bin && \ + ${INSTALL_PROGRAM} ${KBUILD_BINS} ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/share/kBuild && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for doc in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/share/doc/${PORTNAME}-${KBUILD_VERSION}/${doc} ${STAGEDIR}${DOCSDIR} -.endfor + (cd ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/share/doc/${PORTNAME}-${KBUILD_VERSION} && \ + ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> diff --git a/devel/kBuild/distinfo b/devel/kBuild/distinfo index ad1342bc3389..de34fc646ad7 100644 --- a/devel/kBuild/distinfo +++ b/devel/kBuild/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1738249857 -SHA256 (kBuild-0.1.9998r3660-src.tar.xz) = 4a1d9e4ec253bb97a9f6be057515539d271c3f6e1ea1eb0f7d55d761f0409b85 -SIZE (kBuild-0.1.9998r3660-src.tar.xz) = 4202220 +TIMESTAMP = 1769898989 +SHA256 (kBuild-0.1.9998r3687.tar.xz) = 36156c328a0eac111023f6bb2556b6108ec6bd2698898d292c11c63c53184d1e +SIZE (kBuild-0.1.9998r3687.tar.xz) = 3445016 diff --git a/devel/kBuild/files/patch-src_kmk_getopt.h b/devel/kBuild/files/patch-src_kmk_getopt.h new file mode 100644 index 000000000000..d7bc4533ab10 --- /dev/null +++ b/devel/kBuild/files/patch-src_kmk_getopt.h @@ -0,0 +1,11 @@ +--- src/kmk/getopt.h.orig 2026-01-31 20:06:08 UTC ++++ src/kmk/getopt.h +@@ -97,7 +97,7 @@ struct option + #define optional_argument 2 + + #if defined (__STDC__) && __STDC__ +-#ifdef __GNU_LIBRARY__ ++#if defined (__GNU_LIBRARY__) || defined (__FreeBSD__) + /* Many other libraries have conflicting prototypes for getopt, with + differences in the consts, in stdlib.h. To avoid compilation + errors, only prototype getopt for the GNU C library. */ diff --git a/devel/kBuild/files/patch-src_kmk_glob_fnmatch.c b/devel/kBuild/files/patch-src_kmk_glob_fnmatch.c new file mode 100644 index 000000000000..736d4410fc11 --- /dev/null +++ b/devel/kBuild/files/patch-src_kmk_glob_fnmatch.c @@ -0,0 +1,11 @@ +--- src/kmk/glob/fnmatch.c.orig 2026-01-31 20:06:09 UTC ++++ src/kmk/glob/fnmatch.c +@@ -120,7 +120,7 @@ USA. */ + /* Avoid depending on library functions or files + whose names are inconsistent. */ + +-# if !defined _LIBC && !defined getenv && !defined _MSC_VER ++# if !defined _LIBC && !defined getenv && !defined _MSC_VER && !defined __FreeBSD__ + extern char *getenv (); + # endif + diff --git a/devel/kBuild/files/patch-src_oldsed_lib_getopt.h b/devel/kBuild/files/patch-src_oldsed_lib_getopt.h new file mode 100644 index 000000000000..d9214798bbe5 --- /dev/null +++ b/devel/kBuild/files/patch-src_oldsed_lib_getopt.h @@ -0,0 +1,11 @@ +--- src/oldsed/lib/getopt.h.orig 2026-01-31 20:06:20 UTC ++++ src/oldsed/lib/getopt.h +@@ -99,7 +99,7 @@ struct option + #define optional_argument 2 + + #if defined (__STDC__) && __STDC__ +-#ifdef __GNU_LIBRARY__ ++#if defined (__GNU_LIBRARY__) || defined (__FreeBSD__) + /* Many other libraries have conflicting prototypes for getopt, with + differences in the consts, in stdlib.h. To avoid compilation + errors, only prototype getopt for the GNU C library. */ diff --git a/devel/kBuild/pkg-plist b/devel/kBuild/pkg-plist index fa7da327c210..c412f2189070 100644 --- a/devel/kBuild/pkg-plist +++ b/devel/kBuild/pkg-plist @@ -67,6 +67,8 @@ bin/kmk_time %%DATADIR%%/sdks/MACOSX133INCS.kmk %%DATADIR%%/sdks/MACOSX140.kmk %%DATADIR%%/sdks/MACOSX140INCS.kmk +%%DATADIR%%/sdks/MACOSX145.kmk +%%DATADIR%%/sdks/MACOSX145INCS.kmk %%DATADIR%%/sdks/MACOSX150.kmk %%DATADIR%%/sdks/MACOSX150INCS.kmk %%DATADIR%%/sdks/NT4DDK.kmkhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6980ecb1.25d69.4fac2852>