From d868073dab3fe25c674413287b16dbc45b20240e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Mar 2024 11:58:02 +0100 Subject: [PATCH] package/openvmtools: needs dynamic library openvmtools can't be built statically since at least bump to version 10.3.5 in commit 5f0f0f7e4f3362a3695d5876d0f41125a2544285: libtool: link: /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/bin/i586-buildroot-linux-musl-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -static -Wall -Wno-pointer-sign -Wno-unused-value -fno-strict-aliasing -Wno-unknown-pragmas -Wno-uninitialized -Wno-deprecated-declarations -Wno-unused-const-variable -Wno-unused-but-set-variable -static -o vmtoolsd vmtoolsd-cmdLine.o vmtoolsd-mainLoop.o vmtoolsd-mainPosix.o vmtoolsd-pluginMgr.o vmtoolsd-serviceObj.o vmtoolsd-threadPool.o vmtoolsd-toolsRpc.o vmtoolsd-svcSignals.o vmtoolsd-toolsHangDetector.o -pthread -Wl,--export-dynamic -pthread -pthread -pthread /home/autobuild/autobuild/instance-9/output-1/build/openvmtools-11.3.5-18557794/libvmtools/.libs/libvmtools.a -L/home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/bin/../i586-buildroot-linux-musl/sysroot/usr/lib /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/i586-buildroot-li nux-musl/sysroot/usr/lib/libdnet.a /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/i586-buildroot-linux-musl/sysroot/usr/lib/libtirpc.a -lrt -lcrypt -lpthread -lgmodule-2.0 -lgobject-2.0 /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/i586-buildroot-linux-musl/sysroot/usr/lib/libffi.a -lgthread-2.0 -lglib-2.0 -lm /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/i586-buildroot-linux-musl/sysroot/usr/lib/libpcre.a ../../lib/globalConfig/.libs/libGlobalConfig.a -pthread /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/bin/../lib/gcc/i586-buildroot-linux-musl/10.4.0/../../../../i586-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-9/output-1/build/openvmtools-11.3.5-18557794/libvmtools/.libs/libvmtools.a(libvmtools_la-vmtools.o):(.modinfo+0x0): multiple definition of `vm_version'; vmtoolsd-mainPosix.o:(.modinfo+0x0): first defined here Fixes: - http://autobuild.buildroot.org/results/61b03301bc36247c75e797fb294ec7f96bce6e22 - http://autobuild.buildroot.org/results/eea487eb0de911f4e4bce7a557d4c93d732181cf Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit a8b33cb87b6de28e33ac46a20526ebe77c7591f1) Signed-off-by: Peter Korsgaard --- package/openvmtools/Config.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/openvmtools/Config.in b/package/openvmtools/Config.in index 066a7a4736..b62e5d0361 100644 --- a/package/openvmtools/Config.in +++ b/package/openvmtools/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_OPENVMTOOLS depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_ENABLE_LOCALE + depends on !BR2_STATIC_LIBS depends on !BR2_TOOLCHAIN_USES_UCLIBC select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBDNET @@ -30,16 +31,15 @@ if BR2_PACKAGE_OPENVMTOOLS config BR2_PACKAGE_OPENVMTOOLS_PAM bool "PAM support" - # linux-pam needs locale and wchar, but we already have this - # dependency on the main symbol, above. + # linux-pam needs locale, dynamic library and wchar, but we + # already have these dependencies on the main symbol, above. depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # linux-pam - depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LINUX_PAM help Support for PAM in openvmtools -comment "PAM support needs a toolchain w/ dynamic library, gcc >= 4.9" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 +comment "PAM support needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_OPENVMTOOLS_RESOLUTIONKMS bool "resolutionkms support" @@ -57,9 +57,9 @@ comment "resolutionkms needs udev, a toolchain w/ threads" endif -comment "openvmtools needs a glibc or musl toolchain w/ wchar, threads, locale" +comment "openvmtools needs a glibc or musl toolchain w/ wchar, threads, locale, dynamic library" depends on BR2_PACKAGE_OPENVMTOOLS_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_ENABLE_LOCALE || \ + !BR2_ENABLE_LOCALE || BR2_STATIC_LIBS || \ BR2_TOOLCHAIN_USES_UCLIBC