diff --git a/packages/addons/addon-depends/system-tools-depends/mtpfs/package.mk b/packages/addons/addon-depends/system-tools-depends/mtpfs/package.mk
index 15eb9d5c4c..b8e0057980 100644
--- a/packages/addons/addon-depends/system-tools-depends/mtpfs/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/mtpfs/package.mk
@@ -10,12 +10,11 @@ PKG_URL="https://github.com/cjd/mtpfs/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain fuse glib libmtp"
 PKG_LONGDESC="MTPfs is a FUSE filesystem that supports reading and writing from any MTP device."
 PKG_TOOLCHAIN="autotools"
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-mad"
 
 # TODO: mtpfs runs host utils while building, fix and set
 pre_configure_target() {
   export LIBS="-lusb-1.0 -ludev"
-  TARGET_CONFIGURE_OPTS=$(echo ${TARGET_CONFIGURE_OPTS} | sed -e "s|--disable-static||" -e "s|--enable-shared||")
 }
diff --git a/packages/addons/addon-depends/system-tools-depends/screen/package.mk b/packages/addons/addon-depends/system-tools-depends/screen/package.mk
index 9004e63225..65402b112d 100644
--- a/packages/addons/addon-depends/system-tools-depends/screen/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/screen/package.mk
@@ -9,14 +9,10 @@ PKG_SITE="https://www.gnu.org/software/screen/"
 PKG_URL="https://ftpmirror.gnu.org/screen/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses"
 PKG_LONGDESC="Screen is a window manager that multiplexes a physical terminal between several processes"
-PKG_BUILD_FLAGS="-sysroot -parallel"
+PKG_BUILD_FLAGS="-sysroot -parallel -cfg-libs"
 PKG_TOOLCHAIN="autotools"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_utempter_h=no \
                            --disable-pam \
                            --disable-telnet \
                            --disable-socket-dir"
-
-pre_configure_target() {
-  TARGET_CONFIGURE_OPTS=$(echo ${TARGET_CONFIGURE_OPTS} | sed -e "s|--disable-static||" -e "s|--enable-shared||")
-}
diff --git a/packages/addons/service/minisatip/package.mk b/packages/addons/service/minisatip/package.mk
index 84940c5dad..8d045d2b13 100644
--- a/packages/addons/service/minisatip/package.mk
+++ b/packages/addons/service/minisatip/package.mk
@@ -13,7 +13,7 @@ PKG_DEPENDS_TARGET="toolchain libdvbcsa libxml2 openssl"
 PKG_SECTION="service"
 PKG_SHORTDESC="minisatip: a Sat>IP streaming server for Linux"
 PKG_LONGDESC="minisatip(${PKG_VERSION_NUMBER}): is a Sat>IP streaming server for Linux supporting DVB-C, DVB-S/S2, DVB-T/T2, ATSC and ISDB-T"
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Minisatip"
@@ -26,7 +26,6 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --with-xml2=$(get_install_dir libxml2)/usr/include/libxml2"
 
 pre_configure_target() {
-  TARGET_CONFIGURE_OPTS=$(echo ${TARGET_CONFIGURE_OPTS} | sed -e "s|--disable-static||" -e "s|--enable-shared||")
   cd ${PKG_BUILD}
     rm -rf .${TARGET_NAME}
 }
diff --git a/packages/devel/elfutils/package.mk b/packages/devel/elfutils/package.mk
index 830df56e69..1d96d17ad7 100644
--- a/packages/devel/elfutils/package.mk
+++ b/packages/devel/elfutils/package.mk
@@ -12,7 +12,7 @@ PKG_DEPENDS_HOST="autoconf:host automake:host m4:host make:host zlib:host"
 PKG_DEPENDS_TARGET="toolchain zlib elfutils:host"
 PKG_LONGDESC="A collection of utilities to handle ELF objects."
 PKG_TOOLCHAIN="autotools"
-PKG_BUILD_FLAGS="+pic"
+PKG_BUILD_FLAGS="+pic -cfg-libs -cfg-libs:host"
 
 if [ "${LIBREELEC_VERSION}" = "devel" ]; then
   PKG_PROGRAMS="--enable-programs --program-prefix="
@@ -40,14 +40,6 @@ PKG_CONFIGURE_OPTS_TARGET="utrace_cv_cc_biarch=false \
                            --without-bzlib \
                            --without-lzma"
 
-pre_configure_host() {
-  HOST_CONFIGURE_OPTS=$(echo ${HOST_CONFIGURE_OPTS} | sed -e "s|--disable-static||" -e "s|--enable-shared||")
-}
-
-pre_configure_target() {
-  TARGET_CONFIGURE_OPTS=$(echo ${TARGET_CONFIGURE_OPTS} | sed -e "s|--disable-static||" -e "s|--enable-shared||")
-}
-
 post_makeinstall_target() {
   # don't install progs into sysroot
   rm -fr ${SYSROOT_PREFIX}/usr/bin
diff --git a/packages/lang/nasm/package.mk b/packages/lang/nasm/package.mk
index 18d7506449..091bc02151 100644
--- a/packages/lang/nasm/package.mk
+++ b/packages/lang/nasm/package.mk
@@ -11,7 +11,4 @@ PKG_SITE="https://www.nasm.us/"
 PKG_URL="https://www.nasm.us/pub/nasm/releasebuilds/${PKG_VERSION}/nasm-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_LONGDESC="The Netwide Assembler, NASM, is an 80x86 and x86-64 assembler designed for portability and modularity."
-
-pre_configure_host() {
-  HOST_CONFIGURE_OPTS=$(echo ${HOST_CONFIGURE_OPTS} | sed -e "s|--disable-static||" -e "s|--enable-shared||")
-}
+PKG_BUILD_FLAGS="-cfg-libs:host"
diff --git a/packages/network/rsync/package.mk b/packages/network/rsync/package.mk
index 2933d24784..cd20b4c037 100644
--- a/packages/network/rsync/package.mk
+++ b/packages/network/rsync/package.mk
@@ -10,7 +10,7 @@ PKG_URL="https://download.samba.org/pub/rsync/src/${PKG_NAME}-${PKG_VERSION}.tar
 PKG_DEPENDS_HOST="autotools:host zlib:host"
 PKG_DEPENDS_TARGET="toolchain zlib openssl"
 PKG_LONGDESC="A very fast method for bringing remote files into sync."
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs -cfg-libs:host"
 
 PKG_CONFIGURE_OPTS_HOST="--disable-md2man \
                          --disable-ipv6 \
@@ -34,14 +34,6 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-acl-support \
                            --with-included-popt \
                            --without-included-zlib"
 
-pre_configure_host() {
-  HOST_CONFIGURE_OPTS=$(echo ${HOST_CONFIGURE_OPTS} | sed -e "s|--disable-static||" -e "s|--enable-shared||")
-}
-
-pre_configure_target() {
-  TARGET_CONFIGURE_OPTS=$(echo ${TARGET_CONFIGURE_OPTS} | sed -e "s|--disable-static||" -e "s|--enable-shared||")
-}
-
 pre_make_host() {
   # do not detect LE git version
   echo "#define RSYNC_GITVER \"${PKG_VERSION}\"" >git-version.h