Bug 284420 - devel/kBuild: update to r3660
Summary: devel/kBuild: update to r3660
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Vladimir Druzenko
URL:
Keywords:
Depends on:
Blocks: 284439
  Show dependency treegraph
 
Reported: 2025-01-28 18:14 UTC by Jesper Schmitz Mouridsen
Modified: 2025-02-02 18:14 UTC (History)
2 users (show)

See Also:
bugzilla: maintainer-feedback? (vbox)


Attachments
patch updates to include qt6 for vbox 7.1.x (12.83 KB, patch)
2025-01-28 18:14 UTC, Jesper Schmitz Mouridsen
no flags Details | Diff
patch updates to include qt6 for vbox 7.1.x (with rev number patch) (13.29 KB, patch)
2025-01-28 21:51 UTC, Jesper Schmitz Mouridsen
jsm: maintainer-approval? (vbox)
Details | Diff
v1 (7.46 KB, patch)
2025-01-30 15:36 UTC, Vladimir Druzenko
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Jesper Schmitz Mouridsen freebsd_committer freebsd_triage 2025-01-28 18:14:09 UTC
Created attachment 257069 [details]
patch updates to include qt6 for vbox 7.1.x
Comment 1 Vladimir Druzenko freebsd_committer freebsd_triage 2025-01-28 19:34:55 UTC
Why tar.gz instead of tar.xz? The size is 1.5 times larger.
Comment 2 Jesper Schmitz Mouridsen freebsd_committer freebsd_triage 2025-01-28 19:41:25 UTC
no specific reason. I can change it back
Comment 3 Vladimir Druzenko freebsd_committer freebsd_triage 2025-01-28 19:55:29 UTC
(In reply to Jesper Schmitz Mouridsen from comment #2)
IMHO, better tar.xz.
Comment 4 Vladimir Druzenko freebsd_committer freebsd_triage 2025-01-28 20:12:49 UTC
Build without errors on 14.2 amd64:
* in poudriere with default GCC 13;
* on live system with default GCC 14.

Build error emulators/virtualbox-ose-kmod70 (not committed yet) in poudriere with default GCC 13:
cd /wrkdirs/usr/ports/emulators/virtualbox-ose-kmod70/work/VirtualBox-7.0.24/src/VBox/HostDrivers && /bin/sh -c  '. /wrkdirs/usr/ports/emulators/virtualbox-ose-kmod70/work/VirtualBox-7.0.24/env.sh && VBOX_LIBPATH_X11=/usr/local VBOX_FREEBSD_SRC=/usr/src/sys /usr/local/bin/kmk HostDrivers-scripts vboxdrv-src VBoxNetFlt-src VBoxNetAdp-src'
fcntl(): Bad file descriptor
../../../Config.kmk:205: *** You must update kBuild! Requires kBuild binaries 3074 or later, kmk says 0 (0.1.9998-r0).  Stop.
*** Error code 2
Comment 5 Vladimir Druzenko freebsd_committer freebsd_triage 2025-01-28 20:38:08 UTC
(In reply to Vladimir Druzenko from comment #4)
Add to tarball file kBuild-0.1.9998/SvnInfo.kmk:
KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk
KBUILD_SVN_REV := 3660
Comment 6 Jesper Schmitz Mouridsen freebsd_committer freebsd_triage 2025-01-28 21:51:00 UTC
Created attachment 257078 [details]
patch updates to include qt6 for vbox 7.1.x (with rev number patch)

I forgot my rev number patch in the git diff before, now xz as suggested
Comment 7 Vladimir Druzenko freebsd_committer freebsd_triage 2025-01-28 23:06:37 UTC
(In reply to Jesper Schmitz Mouridsen from comment #6)
1. Why not file SvnInfo.kmk like was in previous version? (and this work - I tested)

2. Do we really need kBuild-0.1.9998/kBuild/bin?

$ file kBuild-0.1.9998/kBuild/bin/freebsd.amd64/kmk
kBuild-0.1.9998/kBuild/bin/freebsd.amd64/kmk: ELF 64-bit LSB executable, x86-64, version 1 (FreeBSD), dynamically linked, interpreter /libexec/ld-elf.so.1, for FreeBSD 6.3, stripped

$ du -d1 kBuild-0.1.9998/kBuild/bin/
2929    kBuild-0.1.9998/kBuild/bin/win.arm64
1770    kBuild-0.1.9998/kBuild/bin/solaris.x86
2167    kBuild-0.1.9998/kBuild/bin/os2.x86
1329    kBuild-0.1.9998/kBuild/bin/darwin.amd64
2375    kBuild-0.1.9998/kBuild/bin/linux.amd64
1664    kBuild-0.1.9998/kBuild/bin/solaris.sparc64
1993    kBuild-0.1.9998/kBuild/bin/solaris.amd64
1563    kBuild-0.1.9998/kBuild/bin/solaris.sparc32
3502    kBuild-0.1.9998/kBuild/bin/win.amd64
1341    kBuild-0.1.9998/kBuild/bin/darwin.x86
2349    kBuild-0.1.9998/kBuild/bin/linux.arm64
1128    kBuild-0.1.9998/kBuild/bin/darwin.arm64
1477    kBuild-0.1.9998/kBuild/bin/linux.x86
1032    kBuild-0.1.9998/kBuild/bin/freebsd.x86
1205    kBuild-0.1.9998/kBuild/bin/freebsd.amd64
972     kBuild-0.1.9998/kBuild/bin/haiku.x86
3416    kBuild-0.1.9998/kBuild/bin/win.x86
32209   kBuild-0.1.9998/kBuild/bin/
Comment 8 Vladimir Druzenko freebsd_committer freebsd_triage 2025-01-30 15:36:11 UTC
Created attachment 257126 [details]
v1

I removed bin from tarball and add file SvnInfo.kmk - 4MB instead of 18MB.
Uploaded to "LOCAL/vvd".
Comment 9 Vladimir Druzenko freebsd_committer freebsd_triage 2025-01-31 01:40:34 UTC
This version work for me: build all versions of the virtualbox in ports r5.2.44, 6.1.50 and experimental 7.0.24 on 14.2 amd64 in poudriere and on live system.

If there are no objections, I will commit the patch within the next few days.
Comment 10 Vladimir Druzenko freebsd_committer freebsd_triage 2025-02-02 18:08:32 UTC
I'm committing your patch with small changes.
You can add LOCAL/jsm in MASTER_SITES self if you upload my version of distfiles kBuild-0.1.9998r3660-src.tar.xz (without kBuild-0.1.9998/kBuild/bin and with SvnInfo.kmk).
Comment 11 commit-hook freebsd_committer freebsd_triage 2025-02-02 18:13:41 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9e782d2fea50a1097feadec2a5c61dea806c1ebd

commit 9e782d2fea50a1097feadec2a5c61dea806c1ebd
Author:     Jesper Schmitz Mouridsen <jsm@FreeBSD.org>
AuthorDate: 2025-02-02 18:09:41 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-02-02 18:09:41 +0000

    devel/kBuild: Update 0.1.9998 r3127 → r3660

    The new version supports qt6, which is required for VirtualBox 7.1.x

    PR:     284420

 devel/kBuild/Makefile                              |  6 +--
 devel/kBuild/distinfo                              |  6 +--
 .../kBuild/files/patch-src_kmk_configure.in (gone) | 10 ----
 devel/kBuild/files/patch-src_kmk_make.h (gone)     | 11 -----
 devel/kBuild/files/patch-src_sed_configure (gone)  | 15 ------
 .../files/patch-src_sed_lib_getline.c (gone)       | 11 -----
 .../kBuild/files/patch-src_sed_lib_utils.h (gone)  | 11 -----
 devel/kBuild/pkg-plist                             | 56 ++++++++++++++++++++++
 8 files changed, 62 insertions(+), 64 deletions(-)
Comment 12 Vladimir Druzenko freebsd_committer freebsd_triage 2025-02-02 18:14:42 UTC
Thanks!