diff --git a/packages/addons/addon-depends/system-tools-depends/autossh/package.mk b/packages/addons/addon-depends/system-tools-depends/autossh/package.mk
index 9d5ca84e60..43d657ab27 100644
--- a/packages/addons/addon-depends/system-tools-depends/autossh/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/autossh/package.mk
@@ -10,7 +10,7 @@ PKG_URL="http://www.harding.motd.ca/autossh/autossh-${PKG_VERSION}.tgz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Automatically restart SSH sessions and tunnels."
 PKG_TOOLCHAIN="autotools"
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            ac_cv_func_realloc_0_nonnull=yes"
diff --git a/packages/debug/strace/package.mk b/packages/debug/strace/package.mk
index bff36d82c4..bf3284b718 100644
--- a/packages/debug/strace/package.mk
+++ b/packages/debug/strace/package.mk
@@ -10,6 +10,7 @@ PKG_URL="https://strace.io/files/${PKG_VERSION}/strace-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="strace is a diagnostic, debugging and instructional userspace utility"
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-cfg-libs"
 
 if [ "${TARGET_ARCH}" = x86_64 -o "${TARGET_ARCH}" = "aarch64" ]; then
   PKG_CONFIGURE_OPTS_TARGET="--enable-mpers=no"
diff --git a/packages/devel/autoconf-archive/package.mk b/packages/devel/autoconf-archive/package.mk
index 8c77e6819a..a1bb96a792 100644
--- a/packages/devel/autoconf-archive/package.mk
+++ b/packages/devel/autoconf-archive/package.mk
@@ -10,6 +10,7 @@ PKG_SITE="https://www.gnu.org/software/autoconf-archive/"
 PKG_URL="http://ftpmirror.gnu.org/autoconf-archive/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_LONGDESC="autoconf-archive is an package of m4 macros"
+PKG_BUILD_FLAGS="-cfg-libs:host"
 
 PKG_CONFIGURE_OPTS_HOST="--target=${TARGET_NAME} --prefix=${TOOLCHAIN}"
 
diff --git a/packages/devel/autoconf/package.mk b/packages/devel/autoconf/package.mk
index 1d9fd4f252..8ec2ebc0d7 100644
--- a/packages/devel/autoconf/package.mk
+++ b/packages/devel/autoconf/package.mk
@@ -10,6 +10,7 @@ PKG_SITE="https://www.gnu.org/software/autoconf/"
 PKG_URL="https://ftpmirror.gnu.org/autoconf/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="ccache:host m4:host gettext:host"
 PKG_LONGDESC="A GNU tool for automatically configuring source code."
+PKG_BUILD_FLAGS="-cfg-libs:host"
 
 PKG_CONFIGURE_OPTS_HOST="EMACS=no \
                          ac_cv_path_M4=${TOOLCHAIN}/bin/m4 \
diff --git a/packages/devel/automake/package.mk b/packages/devel/automake/package.mk
index 0e75520e04..25e764c5c0 100644
--- a/packages/devel/automake/package.mk
+++ b/packages/devel/automake/package.mk
@@ -9,7 +9,7 @@ PKG_SITE="http://sources.redhat.com/automake/"
 PKG_URL="http://ftpmirror.gnu.org/automake/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="ccache:host autoconf:host"
 PKG_LONGDESC="A GNU tool for automatically creating Makefiles."
-PKG_BUILD_FLAGS="-parallel"
+PKG_BUILD_FLAGS="-parallel -cfg-libs:host"
 
 PKG_CONFIGURE_OPTS_HOST="--target=${TARGET_NAME} --disable-silent-rules"
 
diff --git a/packages/devel/bison/package.mk b/packages/devel/bison/package.mk
index 1eba27df2b..1ae4a04185 100644
--- a/packages/devel/bison/package.mk
+++ b/packages/devel/bison/package.mk
@@ -10,7 +10,7 @@ PKG_SITE="http://www.gnu.org/software/bison/"
 PKG_URL="http://ftpmirror.gnu.org/bison/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="ccache:host m4:host"
 PKG_LONGDESC="A general-purpose parser generator."
-PKG_BUILD_FLAGS="-parallel"
+PKG_BUILD_FLAGS="-parallel -cfg-libs:host"
 
 PKG_CONFIGURE_OPTS_HOST="--disable-rpath --with-gnu-ld"
 
diff --git a/packages/devel/intltool/package.mk b/packages/devel/intltool/package.mk
index 4fb8320d10..fefcb2299b 100644
--- a/packages/devel/intltool/package.mk
+++ b/packages/devel/intltool/package.mk
@@ -9,6 +9,7 @@ PKG_SITE="http://www.gnome.org"
 PKG_URL="http://launchpad.net/intltool/trunk/${PKG_VERSION}/+download/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_LONGDESC="Tools to translate strings from various source files (.xml.in, .glade, .desktop.in, .server.in, .oaf.in)."
+PKG_BUILD_FLAGS="-cfg-libs:host"
 
 post_makeinstall_host() {
   mkdir -p  ${SYSROOT_PREFIX}/usr/share/aclocal
diff --git a/packages/devel/libfstrcmp/package.mk b/packages/devel/libfstrcmp/package.mk
index 7347ce692d..d464d03957 100644
--- a/packages/devel/libfstrcmp/package.mk
+++ b/packages/devel/libfstrcmp/package.mk
@@ -9,6 +9,7 @@ PKG_SITE="http://fstrcmp.sourceforge.net/"
 PKG_URL="https://downloads.sourceforge.net/project/fstrcmp/fstrcmp/$(get_pkg_version_maj_min)/fstrcmp-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="The fstrcmp project provides a library that is used to make fuzzy comparisons of strings and byte arrays, including multi-byte character strings."
+PKG_BUILD_FLAGS="-cfg-libs"
 
 pre_configure_target() {
   cd "${PKG_BUILD}"
diff --git a/packages/devel/m4/package.mk b/packages/devel/m4/package.mk
index 328a79a8c8..3e430de17c 100644
--- a/packages/devel/m4/package.mk
+++ b/packages/devel/m4/package.mk
@@ -9,6 +9,7 @@ PKG_SITE="http://www.gnu.org/software/m4/"
 PKG_URL="http://ftpmirror.gnu.org/m4/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_LONGDESC="The m4 macro processor."
+PKG_BUILD_FLAGS="-cfg-libs:host"
 
 PKG_CONFIGURE_OPTS_HOST="gl_cv_func_gettimeofday_clobber=no --target=${TARGET_NAME}"
 
diff --git a/packages/devel/make/package.mk b/packages/devel/make/package.mk
index e9a4793e6f..3e410d0fc1 100644
--- a/packages/devel/make/package.mk
+++ b/packages/devel/make/package.mk
@@ -10,7 +10,7 @@ PKG_SITE="https://www.gnu.org/software/make/"
 PKG_URL="http://ftpmirror.gnu.org/make/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST=""
 PKG_LONGDESC="Utility to maintain groups of programs."
-PKG_BUILD_FLAGS="+local-cc"
+PKG_BUILD_FLAGS="+local-cc -cfg-libs:host"
 
 post_makeinstall_host() {
   ln -sf make ${TOOLCHAIN}/bin/gmake
diff --git a/packages/devel/patchelf/package.mk b/packages/devel/patchelf/package.mk
index 7c8c66aea6..f8c6f17406 100644
--- a/packages/devel/patchelf/package.mk
+++ b/packages/devel/patchelf/package.mk
@@ -10,3 +10,4 @@ PKG_URL="https://github.com/NixOS/patchelf/releases/download/${PKG_VERSION}/patc
 PKG_DEPENDS_HOST="autotools:host"
 PKG_LONGDESC="A small utility to modify the dynamic linker and RPATH of ELF executables"
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-cfg-libs:host"
diff --git a/packages/devel/slang/package.mk b/packages/devel/slang/package.mk
index b91d98051e..31cb371a5e 100644
--- a/packages/devel/slang/package.mk
+++ b/packages/devel/slang/package.mk
@@ -10,7 +10,7 @@ PKG_SITE="http://www.jedsoft.org/slang/"
 PKG_URL="https://www.jedsoft.org/releases/slang/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A library designed to allow a developer to create robust multi-platform software."
-PKG_BUILD_FLAGS="-parallel"
+PKG_BUILD_FLAGS="-parallel -cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="--without-pcre \
                            --without-onig"
diff --git a/packages/network/cifs-utils/package.mk b/packages/network/cifs-utils/package.mk
index 0470b82497..b63430a3ac 100644
--- a/packages/network/cifs-utils/package.mk
+++ b/packages/network/cifs-utils/package.mk
@@ -9,6 +9,7 @@ PKG_SITE="https://wiki.samba.org/index.php/LinuxCIFS_utils"
 PKG_URL="https://download.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Linux CIFS userspace utilities"
+PKG_BUILD_FLAGS="-cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            ac_cv_func_realloc_0_nonnull=yes \
diff --git a/packages/network/ethtool/package.mk b/packages/network/ethtool/package.mk
index 466502ff46..b6cabf49e0 100644
--- a/packages/network/ethtool/package.mk
+++ b/packages/network/ethtool/package.mk
@@ -10,3 +10,4 @@ PKG_SITE="https://www.kernel.org/pub/software/network/ethtool/"
 PKG_URL="https://www.kernel.org/pub/software/network/ethtool/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libmnl"
 PKG_LONGDESC="Ethtool is used for querying settings of an ethernet device and changing them."
+PKG_BUILD_FLAGS="-cfg-libs"
diff --git a/packages/network/openssh/package.mk b/packages/network/openssh/package.mk
index ad0b402d0c..5fa6c4e498 100644
--- a/packages/network/openssh/package.mk
+++ b/packages/network/openssh/package.mk
@@ -11,7 +11,7 @@ PKG_URL="https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/${PKG_NAME}-${PKG_
 PKG_DEPENDS_TARGET="toolchain openssl zlib"
 PKG_LONGDESC="An open re-implementation of the SSH package."
 PKG_TOOLCHAIN="autotools"
-PKG_BUILD_FLAGS="+lto"
+PKG_BUILD_FLAGS="+lto -cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_rpc_types_h=no \
                            --sysconfdir=/etc/ssh \
diff --git a/packages/network/rpcbind/package.mk b/packages/network/rpcbind/package.mk
index 162eef3463..1c430edd28 100644
--- a/packages/network/rpcbind/package.mk
+++ b/packages/network/rpcbind/package.mk
@@ -10,6 +10,7 @@ PKG_SITE="http://rpcbind.sourceforge.net/"
 PKG_URL="${SOURCEFORGE_SRC}/rpcbind/rpcbind/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain libtirpc systemd"
 PKG_LONGDESC="The rpcbind utility is a server that converts RPC program numbers into universal addresses."
+PKG_BUILD_FLAGS="-cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_rpcsvc_mount_h=no \
                            --disable-warmstarts \
diff --git a/packages/security/nspr/package.mk b/packages/security/nspr/package.mk
index 299c1190ef..8e4ab4b588 100644
--- a/packages/security/nspr/package.mk
+++ b/packages/security/nspr/package.mk
@@ -11,7 +11,7 @@ PKG_DEPENDS_TARGET="autotools:host gcc:host nss:host nspr:host"
 PKG_DEPENDS_UNPACK="nss"
 PKG_LONGDESC="Netscape Portable Runtime (NSPR) provides a platform-neutral API for system level and libc like functions"
 PKG_TOOLCHAIN="configure"
-PKG_BUILD_FLAGS="-parallel"
+PKG_BUILD_FLAGS="-parallel -cfg-libs"
 
 if [ "${TARGET_ARCH}" = "x86_64" ]; then
   TARGET_USE_64="--enable-64bit"
diff --git a/packages/sysutils/dosfstools/package.mk b/packages/sysutils/dosfstools/package.mk
index 8295c3ff46..0dc5c98dbd 100644
--- a/packages/sysutils/dosfstools/package.mk
+++ b/packages/sysutils/dosfstools/package.mk
@@ -12,6 +12,7 @@ PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_DEPENDS_INIT="toolchain"
 PKG_LONGDESC="dosfstools contains utilities for making and checking MS-DOS FAT filesystems."
+PKG_BUILD_FLAGS="-cfg-libs -cfg-libs:host -cfg-libs:init"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-compat-symlinks"
 PKG_MAKE_OPTS_TARGET="PREFIX=/usr"
diff --git a/packages/sysutils/e2fsprogs/package.mk b/packages/sysutils/e2fsprogs/package.mk
index 67235cdc49..8a43de793c 100644
--- a/packages/sysutils/e2fsprogs/package.mk
+++ b/packages/sysutils/e2fsprogs/package.mk
@@ -12,7 +12,7 @@ PKG_DEPENDS_HOST="autotools:host"
 PKG_DEPENDS_TARGET="autotools:host gcc:host"
 PKG_DEPENDS_INIT="autotools:host gcc:host"
 PKG_LONGDESC="The filesystem utilities for the EXT2 filesystem, including e2fsck, mke2fs, dumpe2fs, fsck, and others."
-PKG_BUILD_FLAGS="-parallel"
+PKG_BUILD_FLAGS="-parallel -cfg-libs -cfg-libs:host -cfg-libs:init"
 
 PKG_CONFIGURE_OPTS_HOST="--prefix=${TOOLCHAIN}/ \
                          --bindir=${TOOLCHAIN}/bin \
diff --git a/packages/sysutils/eventlircd/package.mk b/packages/sysutils/eventlircd/package.mk
index 2bac6d268a..bef801e727 100644
--- a/packages/sysutils/eventlircd/package.mk
+++ b/packages/sysutils/eventlircd/package.mk
@@ -11,6 +11,7 @@ PKG_URL="https://github.com/LibreELEC/eventlircd/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain systemd lirc"
 PKG_LONGDESC="The eventlircd daemon provides four functions for LIRC devices"
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="--with-udev-dir=/usr/lib/udev \
                            --with-lircd-socket=/run/lirc/lircd"
diff --git a/packages/sysutils/sed/package.mk b/packages/sysutils/sed/package.mk
index 2886321803..d0e5966445 100644
--- a/packages/sysutils/sed/package.mk
+++ b/packages/sysutils/sed/package.mk
@@ -10,5 +10,6 @@ PKG_SITE="http://www.gnu.org/software/sed/"
 PKG_URL="https://mirrors.kernel.org/gnu/sed/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_LONGDESC="The sed (Stream EDitor) editor is a stream or batch (non-interactive) editor."
+PKG_BUILD_FLAGS="-cfg-libs:host"
 
 PKG_CONFIGURE_OPTS_HOST="--disable-nls --disable-acl --without-selinux"
diff --git a/packages/textproc/xmlstarlet/package.mk b/packages/textproc/xmlstarlet/package.mk
index 59c859cdac..6921747fe5 100644
--- a/packages/textproc/xmlstarlet/package.mk
+++ b/packages/textproc/xmlstarlet/package.mk
@@ -10,6 +10,7 @@ PKG_URL="http://netcologne.dl.sourceforge.net/project/xmlstar/${PKG_NAME}/${PKG_
 PKG_DEPENDS_HOST="libxml2:host libxslt:host"
 PKG_DEPENDS_TARGET="toolchain libxml2 libxslt"
 PKG_LONGDESC="XMLStarlet is a command-line XML utility which allows the modification and validation of XML documents."
+PKG_BUILD_FLAGS="-cfg-libs -cfg-libs:host"
 
 PKG_CONFIGURE_OPTS_HOST="  ac_cv_func_malloc_0_nonnull=yes \
                            ac_cv_func_realloc_0_nonnull=yes \
diff --git a/packages/tools/grub/package.mk b/packages/tools/grub/package.mk
index fe2492805a..9d32772898 100755
--- a/packages/tools/grub/package.mk
+++ b/packages/tools/grub/package.mk
@@ -13,6 +13,7 @@ PKG_DEPENDS_TARGET="toolchain flex freetype:host gettext:host grub:host"
 PKG_DEPENDS_UNPACK="gnulib"
 PKG_LONGDESC="GRUB is a Multiboot boot loader."
 PKG_TOOLCHAIN="configure"
+PKG_BUILD_FLAGS="-cfg-libs -cfg-libs:host"
 
 pre_configure_host() {
   unset CFLAGS
diff --git a/packages/tools/mtools/package.mk b/packages/tools/mtools/package.mk
index ed7e58752e..923ca9b249 100644
--- a/packages/tools/mtools/package.mk
+++ b/packages/tools/mtools/package.mk
@@ -11,3 +11,4 @@ PKG_URL="http://ftpmirror.gnu.org/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.bz2
 PKG_DEPENDS_HOST="toolchain:host"
 PKG_LONGDESC="mtools: A collection of utilities to access MS-DOS disks"
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-cfg-libs:host"
diff --git a/packages/tools/nano/package.mk b/packages/tools/nano/package.mk
index 15a0c54f23..9bdee91dcf 100644
--- a/packages/tools/nano/package.mk
+++ b/packages/tools/nano/package.mk
@@ -10,6 +10,7 @@ PKG_SITE="https://www.nano-editor.org/"
 PKG_URL="https://www.nano-editor.org/dist/v${PKG_VERSION%%.*}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain ncurses"
 PKG_LONGDESC="Nano is an enhanced clone of the Pico text editor."
+PKG_BUILD_FLAGS="-cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-utf8 \
                            --disable-nls \
diff --git a/packages/tools/newt/package.mk b/packages/tools/newt/package.mk
index 6bdaca02a2..e0993d117b 100644
--- a/packages/tools/newt/package.mk
+++ b/packages/tools/newt/package.mk
@@ -10,6 +10,7 @@ PKG_URL="https://releases.pagure.org/newt/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain slang popt"
 PKG_LONGDESC="Newt is a programming library for color text mode, widget based user interfaces."
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-nls \
                            --without-python \
diff --git a/packages/x11/util/util-macros/package.mk b/packages/x11/util/util-macros/package.mk
index e3b4a1b2fc..6d0369ef0a 100644
--- a/packages/x11/util/util-macros/package.mk
+++ b/packages/x11/util/util-macros/package.mk
@@ -10,6 +10,7 @@ PKG_SITE="https://www.X.org"
 PKG_URL="https://xorg.freedesktop.org/archive/individual/util/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="X.org autoconf utilities such as M4 macros."
+PKG_BUILD_FLAGS="-cfg-libs"
 
 post_makeinstall_target() {
   rm -rf ${INSTALL}/usr