Skip to content

Commit a022f83

Browse files
committed
vice: explicitly pin all configure knobs to fix missing library deps
The buildbot reported vice missing dependencies for libbsd.so.0, libnet.so.9 and libusb-1.0.so.0. All three came from configure autodetecting libraries that merely happened to be present in staging_dir: - The NETPLAY_LIBS probes run AC_CHECK_LIB(bsd/net/..., gethostbyname) and AC_CHECK_LIB(bsd, gettimeofday). On musl these symbols live in libc, so every probe spuriously succeeds for any of those libraries that exists, appending -lbsd and -lnet. - The USBSID-Pico path adds -lusb-1.0 to LIBS whenever libusb-1.0/libusb.h is found; it is gated only by the unregistered $enable_usbsid shell variable. Force the offending cache variables off and set enable_usbsid=no, and pin every remaining dependency-affecting knob to an explicit value so nothing is auto-detected. Also disable --enable-arch, which defaults to on and injects -march=native, wrong under cross-compilation. Verified on x86_64: the binaries no longer link libbsd, libnet or libusb and the package builds cleanly. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
1 parent b59c3b5 commit a022f83

1 file changed

Lines changed: 28 additions & 3 deletions

File tree

games/vice/Makefile

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
22

33
PKG_NAME:=vice
44
PKG_VERSION:=3.10
5-
PKG_RELEASE:=1
5+
PKG_RELEASE:=2
66

77
PKG_SOURCE:=vice-$(PKG_VERSION).tar.gz
88
PKG_SOURCE_URL:=@SF/vice-emu/releases
@@ -34,23 +34,48 @@ endef
3434

3535
CONFIGURE_VARS += \
3636
DOS2UNIX=true \
37-
MAKEINFO=true
37+
MAKEINFO=true \
38+
enable_usbsid=no \
39+
ac_cv_header_libusb_1_0_libusb_h=no \
40+
ac_cv_lib_bsd_gethostbyname=no \
41+
ac_cv_lib_bsd_gettimeofday=no \
42+
ac_cv_lib_net_gethostbyname=no \
43+
ac_cv_lib_nsl_gethostbyname=no \
44+
ac_cv_lib_socket_gethostbyname=no \
45+
ac_cv_lib_inet_gethostbyname=no \
46+
ac_cv_lib_intl_dgettext=no
3847

3948
CONFIGURE_ARGS += \
4049
--enable-sdl2ui \
4150
--disable-sdl1ui \
4251
--disable-gtk3ui \
4352
--disable-headlessui \
53+
--disable-arch \
54+
--disable-openmp \
4455
--disable-html-docs \
56+
--disable-ethernet \
57+
--disable-realdevice \
58+
--disable-catweasel \
59+
--disable-hardsid \
60+
--disable-parsid \
61+
--disable-midi \
62+
--with-alsa \
63+
--with-resid \
64+
--without-fastsid \
65+
--without-sdlsound \
4566
--without-pulse \
4667
--without-portaudio \
4768
--without-oss \
69+
--without-sun \
4870
--without-vorbis \
4971
--without-flac \
5072
--without-lame \
73+
--without-static-lame \
5174
--without-mpg123 \
75+
--with-png \
76+
--without-gif \
5277
--without-libcurl \
53-
--disable-ethernet
78+
--without-libieee1284
5479

5580
define Package/vice/install
5681
$(INSTALL_DIR) $(1)/usr/bin

0 commit comments

Comments
 (0)