summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Kroon <jacob.kroon@gmail.com>2021-12-23 16:38:07 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-01-05 17:18:11 +0000
commit0f018da9416648ea50cbccc3d4424f0b8a9352b6 (patch)
tree0563d6a1495e90db7f945aa7041038085ee04142
parent66e06fd409c27f212f41b69a01416cea41a198cd (diff)
downloadopenembedded-core-contrib-0f018da9416648ea50cbccc3d4424f0b8a9352b6.tar.gz
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 <jacob.kroon@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/no-static-libs.inc9
1 files changed, 1 insertions, 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"