From nobody Tue Nov 23 10:08:24 2021 X-Original-To: dev-commits-ports-all@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 6802C18AF1BD; Tue, 23 Nov 2021 10:08:25 +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 4Hz0G10r8jz3lpc; Tue, 23 Nov 2021 10:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 F0924145F5; Tue, 23 Nov 2021 10:08:24 +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 1ANA8Okl079725; Tue, 23 Nov 2021 10:08:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ANA8Ob6079724; Tue, 23 Nov 2021 10:08:24 GMT (envelope-from git) Date: Tue, 23 Nov 2021 10:08:24 GMT Message-Id: <202111231008.1ANA8Ob6079724@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 06f66cc22183 - main - emulators/virtualbox-ose: Fix unintentional change List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06f66cc221838f72984c891be3ece5f832ecf717 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637662105; 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=5q9dLP0fowudW7OM1sSKy5ix9hIRwC+9yiu8Wh30wwo=; b=tIpnq5bkDOItfNiEy7764v6XHTyDqvN2XvksKLAxcBwvtUxfHd/DoAozU1JrySmM9P09Tf 6lXNeuPIg/ytRkHFAGkPIy/WHbnkS6iwy5qcI+ENct8X0McUjs866PLspDzVZKap0TPvTa 6R/oteXBXS2lxdNeIBaUZPUMo8ZIeJ5HC1gJPqEE/GY5E/kP8upuh0nJH8ukjGRAkQCbvE yBHRfIfwNcwfbgBnUmPVuHwodI5B4N+Il/FrLkUiUUSTgnpSZPngZEqSQkyxWX+ry/R2w2 r1Cum++8sji4qZ6M51zI+sXf1Da/g2gh1mHmf2eb/jVSHDtYv6ujkfluxhK2KA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637662105; a=rsa-sha256; cv=none; b=jyafB0Ijii5wyI0WhuP3WCECq9f21+MnkKkGUIa//tLmaMYb6Ag23S/k/iz4qSXgCby5bg Hafk2QGpqjloT42DQpFEkQOfn7YAQn6Tra4E8aVWY0PUUkSEN5liXMmBHaSdv7ksWVpsVI bqPXqn/dekoFk0Fb+KoYHFbzEVaJ/zCKAytxmhuqRZneMqU/sThlapkOD+51xDhj+DxtOO JG9ht/feuaKcT0fua5qjV0l5jFSQ37nPDU/GvHchO8jm0vXZYX2dTDx6GEd2AyyPq5i9g4 FPwkPQSNYBTT2/PbMLE0J1g8FS0eg8Y84nbPWJZhtt5iQNHm40Qvt/CtmHJf2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=06f66cc221838f72984c891be3ece5f832ecf717 commit 06f66cc221838f72984c891be3ece5f832ecf717 Author: Guido Falsi AuthorDate: 2021-11-23 10:06:23 +0000 Commit: Guido Falsi CommitDate: 2021-11-23 10:06:23 +0000 emulators/virtualbox-ose: Fix unintentional change AAn unintentional change slipped in a previous commit. Revert that part. No change in the produced packages. Fixes: 32c43c50524246 --- emulators/virtualbox-ose/Makefile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 0b59cc614327..b2e4e297be04 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -234,18 +234,18 @@ 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 +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}' > \