mirror of
https://github.com/openwrt/video.git
synced 2026-07-12 20:34:48 +04:00
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>
This commit is contained in:
+28
-3
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=vice
|
||||
PKG_VERSION:=3.10
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE:=vice-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=@SF/vice-emu/releases
|
||||
@@ -34,23 +34,48 @@ endef
|
||||
|
||||
CONFIGURE_VARS += \
|
||||
DOS2UNIX=true \
|
||||
MAKEINFO=true
|
||||
MAKEINFO=true \
|
||||
enable_usbsid=no \
|
||||
ac_cv_header_libusb_1_0_libusb_h=no \
|
||||
ac_cv_lib_bsd_gethostbyname=no \
|
||||
ac_cv_lib_bsd_gettimeofday=no \
|
||||
ac_cv_lib_net_gethostbyname=no \
|
||||
ac_cv_lib_nsl_gethostbyname=no \
|
||||
ac_cv_lib_socket_gethostbyname=no \
|
||||
ac_cv_lib_inet_gethostbyname=no \
|
||||
ac_cv_lib_intl_dgettext=no
|
||||
|
||||
CONFIGURE_ARGS += \
|
||||
--enable-sdl2ui \
|
||||
--disable-sdl1ui \
|
||||
--disable-gtk3ui \
|
||||
--disable-headlessui \
|
||||
--disable-arch \
|
||||
--disable-openmp \
|
||||
--disable-html-docs \
|
||||
--disable-ethernet \
|
||||
--disable-realdevice \
|
||||
--disable-catweasel \
|
||||
--disable-hardsid \
|
||||
--disable-parsid \
|
||||
--disable-midi \
|
||||
--with-alsa \
|
||||
--with-resid \
|
||||
--without-fastsid \
|
||||
--without-sdlsound \
|
||||
--without-pulse \
|
||||
--without-portaudio \
|
||||
--without-oss \
|
||||
--without-sun \
|
||||
--without-vorbis \
|
||||
--without-flac \
|
||||
--without-lame \
|
||||
--without-static-lame \
|
||||
--without-mpg123 \
|
||||
--with-png \
|
||||
--without-gif \
|
||||
--without-libcurl \
|
||||
--disable-ethernet
|
||||
--without-libieee1284
|
||||
|
||||
define Package/vice/install
|
||||
$(INSTALL_DIR) $(1)/usr/bin
|
||||
|
||||
Reference in New Issue
Block a user