kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

emulators/virtualbox-ose: Remove unnecessary dependency on 32-bit compat for amd64

Browse source 
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 <olivier.freebsd@free.fr>
Approved by:		arrowd (mentor)
Differential Revision:	https://reviews.freebsd.org/D40487
This commit is contained in:
Vladimir Druzenko 2023-06-12 19:05:20 +03:00
parent 5b3ea0f8c4
commit fd06fe3d7c
2 changed files with 0 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
emulators/virtualbox-ose/Makefile
View file

@ -123,10 +123,6 @@ OPTIONS_DEFAULT+= PYTHON
CONFLICTS_INSTALL+= virtualbox-ose CONFLICTS_INSTALL+= virtualbox-ose
.endif .endif
.if ${ARCH} == "amd64"
_ELF32!= kldstat -q -m elf32 && echo yes || echo no
.endif
.if ${PORT_OPTIONS:MDEBUG} .if ${PORT_OPTIONS:MDEBUG}
KMK_BUILDTYPE= debug KMK_BUILDTYPE= debug
KMK_FLAGS+= BUILD_TYPE=debug KMK_FLAGS+= BUILD_TYPE=debug
@ -196,14 +192,7 @@ PLIST_SUB+= SDK=""
PLIST_SUB+= SDK="@comment " PLIST_SUB+= SDK="@comment "
.endif .endif
.if ${ARCH} == i386
KMK_ARCH= freebsd.x86
PLIST_SUB+= I386=""
.else
KMK_ARCH= freebsd.${ARCH} KMK_ARCH= freebsd.${ARCH}
PLIST_SUB+= I386="@comment "
.endif
PLIST_SUB+= ARCH="${KMK_ARCH}" PLIST_SUB+= ARCH="${KMK_ARCH}"
KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE} KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}
@ -254,19 +243,6 @@ PLIST_SUB+= PYTHON_PYCDIR=/ \
CONFIGURE_ARGS+= --with-openssl-dir="${OPENSSLBASE}" CONFIGURE_ARGS+= --with-openssl-dir="${OPENSSLBASE}"
.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: post-patch:
@${ECHO_CMD} 'VBOX_PATH_APP_PRIVATE_ARCH = ${VBOX_DIR}' > \ @${ECHO_CMD} 'VBOX_PATH_APP_PRIVATE_ARCH = ${VBOX_DIR}' > \
${WRKSRC}/LocalConfig.kmk ${WRKSRC}/LocalConfig.kmk

2
emulators/virtualbox-ose/pkg-plist
View file

@ -402,8 +402,6 @@ lib/virtualbox/VBoxManage
lib/virtualbox/VBoxNetDHCP.so lib/virtualbox/VBoxNetDHCP.so
@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxNetNAT @(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxNetNAT
lib/virtualbox/VBoxNetNAT.so lib/virtualbox/VBoxNetNAT.so
%%I386%%lib/virtualbox/VBoxREM32.so
%%I386%%lib/virtualbox/VBoxREM64.so
lib/virtualbox/VBoxRT.so lib/virtualbox/VBoxRT.so
%%X11%%@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxSDL %%X11%%@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxSDL
%%X11%%lib/virtualbox/VBoxSDL.so %%X11%%lib/virtualbox/VBoxSDL.so