From nobody Mon Jun 12 16:23:52 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qfxp04rLKz4d2Ps; Mon, 12 Jun 2023 16:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qfxp04Ns2z4lH5; Mon, 12 Jun 2023 16:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686587032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hb7foEu9BuoeiLEAPfzm0JxEJv7SN/aW/shroCMJdXM=; b=h2ItJ6GQMxmLnehfxr9FdPQmi3s83ryQAox/cB1hkGm8p0I1nf4tIah/bmkGB097IPzslg tNLo7ILoDsoir1O8V+4q9AfP32Ra9iv1LLnYcZlp5WvPyiKHLXryl9B3jUKdtGXdxkzIdH NL6GJaklhxXjuPebcg0Y0HmsH+/+qM9qmVvlUNAltFuu9Z28rD5uB/ssE/EEvYX4yKd6cW rCi2H/yGwDjfoN/948JU7yVuWt+chBR8AhnraNF4XSVU6xnVNRRTmYV4kcccE52ULQMm2S lRDlOJruJAN7VC9m9Z0Z8bPORMP2lxSiff3SyQ6jXOj5J8zzaU6JuNO73Q8fSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686587032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hb7foEu9BuoeiLEAPfzm0JxEJv7SN/aW/shroCMJdXM=; b=tCVrQ8Q9joHg3bFHsxer7mRyPyZyILJjrQdjNqtSo1GvIDurHde1PmG1YOybXYKEJe7BYd WKqPGZY+4pmXZc9YqLGMicB/6Y31ecwasZr1v6QcU5tAyGRLNIMUvYidiIYK1IoDqAS543 bNaIb0oflp9sBEyxlxyyIpQUTIHu8olPRW0kaG6HnbOX450VvQK3QqRDjBTq5zeDgU63Gv WFP80IWbFhfk+TKQfas3G6gQIn0XnYps00zX/JjKOXzqh5/5botKudZk1V8vgAavemWjHe WtMAQk8PO13ywTpU26Mv1KDolCjXxz/VwgmXhLHHcpaBMMcDNvxRNsDoeuFq5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686587032; a=rsa-sha256; cv=none; b=MMa5Na5PP+DIIMIOa3Mm1om7a5dvB/3DLAPo86JFfRcIu0swbiuank3svg6NbzpQod0AKC fEaXCQKyc5L6pgQyCZyMqpr505CB1JL9iMPUwpXDEWQZUtzTpjVsh2vP5JhyKHqrDAwTtC NeEEZ/mneOC0RB27iWpoRc2zGeAHRuYePcb0fU1WsJkXGKVoJ4PbvVdhFjiDI/ck02p1Cr fc5yfcNwTMGNJ0uJFqQMc5XcccSv3MZP3ltxSR83Riy8Nd7Z5oXjrXYjC8w3YRlw6tl93+ tIkQJ0JGKzlnB/lqYmZwoZIDe7rKeQah2orsJkXODl5s84uN0+yFygtgukRGqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qfxp03RnMzmcf; Mon, 12 Jun 2023 16:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35CGNqDS044983; Mon, 12 Jun 2023 16:23:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35CGNqLC044982; Mon, 12 Jun 2023 16:23:52 GMT (envelope-from git) Date: Mon, 12 Jun 2023 16:23:52 GMT Message-Id: <202306121623.35CGNqLC044982@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: fd06fe3d7c9a - main - emulators/virtualbox-ose: Remove unnecessary dependency on 32-bit compat for amd64 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd06fe3d7c9a9bc13ec7828f18d4e652aa102604 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd06fe3d7c9a9bc13ec7828f18d4e652aa102604 commit fd06fe3d7c9a9bc13ec7828f18d4e652aa102604 Author: Vladimir Druzenko AuthorDate: 2023-06-12 16:05:20 +0000 Commit: Vladimir Druzenko CommitDate: 2023-06-12 16:05:20 +0000 emulators/virtualbox-ose: Remove unnecessary dependency on 32-bit compat for amd64 32-bit in-kernel support and lib32 libs are not necessary for VirtualBox 6.x, so just remove this requirement. Also the port support amd64 only - remove I386 from PLIST_SUB. PR: 266382 Tested by: Olivier Certner Approved by: arrowd (mentor) Differential Revision: https://reviews.freebsd.org/D40487 --- emulators/virtualbox-ose/Makefile | 24 ------------------------ emulators/virtualbox-ose/pkg-plist | 2 -- 2 files changed, 26 deletions(-) diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 1ce1be90124c..cf5b211e33f5 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -123,10 +123,6 @@ OPTIONS_DEFAULT+= PYTHON CONFLICTS_INSTALL+= virtualbox-ose .endif -.if ${ARCH} == "amd64" -_ELF32!= kldstat -q -m elf32 && echo yes || echo no -.endif - .if ${PORT_OPTIONS:MDEBUG} KMK_BUILDTYPE= debug KMK_FLAGS+= BUILD_TYPE=debug @@ -196,14 +192,7 @@ PLIST_SUB+= SDK="" PLIST_SUB+= SDK="@comment " .endif -.if ${ARCH} == i386 -KMK_ARCH= freebsd.x86 -PLIST_SUB+= I386="" -.else KMK_ARCH= freebsd.${ARCH} -PLIST_SUB+= I386="@comment " -.endif - PLIST_SUB+= ARCH="${KMK_ARCH}" KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE} @@ -254,19 +243,6 @@ PLIST_SUB+= PYTHON_PYCDIR=/ \ CONFIGURE_ARGS+= --with-openssl-dir="${OPENSSLBASE}" .endif -pre-everything:: -.if ${ARCH} == "amd64" -.if ${_ELF32} != yes - @${ECHO_MSG} 'Requires 32-bit runtime support in kernel.' - @${ECHO_MSG} 'Rebuild kernel with "options COMPAT_FREEBSD32" and reboot.' - @${FALSE} -.elif !exists(/usr/lib32/libc.so) - @${ECHO_MSG} 'Requires 32-bit libraries installed under /usr/lib32.' - @${ECHO_MSG} 'Do: cd /usr/src; make build32 install32; service ldconfig restart' - @${FALSE} -.endif -.endif - post-patch: @${ECHO_CMD} 'VBOX_PATH_APP_PRIVATE_ARCH = ${VBOX_DIR}' > \ ${WRKSRC}/LocalConfig.kmk diff --git a/emulators/virtualbox-ose/pkg-plist b/emulators/virtualbox-ose/pkg-plist index 5a71bfe95aa0..ee26bfa71c09 100644 --- a/emulators/virtualbox-ose/pkg-plist +++ b/emulators/virtualbox-ose/pkg-plist @@ -402,8 +402,6 @@ lib/virtualbox/VBoxManage lib/virtualbox/VBoxNetDHCP.so @(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxNetNAT lib/virtualbox/VBoxNetNAT.so -%%I386%%lib/virtualbox/VBoxREM32.so -%%I386%%lib/virtualbox/VBoxREM64.so lib/virtualbox/VBoxRT.so %%X11%%@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxSDL %%X11%%lib/virtualbox/VBoxSDL.so