From 0f018da9416648ea50cbccc3d4424f0b8a9352b6 Mon Sep 17 00:00:00 2001 From: Jacob Kroon Date: Thu, 23 Dec 2021 16:38:07 +0100 Subject: [PATCH] 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 Signed-off-by: Jacob Kroon Signed-off-by: Richard Purdie --- meta/conf/distro/include/no-static-libs.inc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/meta/conf/distro/include/no-static-libs.inc b/meta/conf/distro/include/no-static-libs.inc index 7c6cf35934..ee67383460 100644 --- a/meta/conf/distro/include/no-static-libs.inc +++ b/meta/conf/distro/include/no-static-libs.inc @@ -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" -- 2.40.1