Skip to contentSkip to conversation

no-static-libs.inc: Fixes

PATCH New Jacob Kroon 1 participant 1 message Dec 23, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 no-static-libs.inc: Fixes

* pciutils/libcap/libpcap all seem to build fine even with the flag set
* Disable static libraries in libjpeg-turbo-native

---
 meta/conf/distro/include/no-static-libs.inc | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
meta/conf/distro/include/no-static-libs.inc +1 -8
index 7c6cf35934..ee67383460 100644
@@ -5,14 +5,6 @@ DISABLE_STATIC:pn-qemu = ""
 DISABLE_STATIC:pn-qemu-native = ""
 DISABLE_STATIC:pn-nativesdk-qemu = ""
 DISABLE_STATIC:pn-qemu-system-native = ""
-# pciutils fails build
-DISABLE_STATIC:pn-pciutils = ""
-# libcap aborts on unrecognised option
-DISABLE_STATIC:pn-libcap = ""
-DISABLE_STATIC:pn-libcap-native = ""
-DISABLE_STATIC:pn-nativesdk-libcap = ""
-# libpcap aborts on unrecognised option
-DISABLE_STATIC:pn-libpcap = ""
 # needed by gdb
 DISABLE_STATIC:pn-readline = ""
 # openjade/sgml-common have build issues without static libs
@@ -31,6 +23,7 @@ EXTRA_OECONF:append = "${DISABLE_STATIC}"
 
 EXTRA_OECMAKE:append:pn-libical = " -DSHARED_ONLY=True"
 EXTRA_OECMAKE:append:pn-libjpeg-turbo = " -DENABLE_STATIC=False"
+EXTRA_OECMAKE:append:pn-libjpeg-turbo-native = " -DENABLE_STATIC=False"
 
 EXCONFIG_ARGS:append:pn-ncurses = " --without-normal"
 EXCONFIG_ARGS:append:pn-ncurses-native = " --without-normal"