packages: fix more references to setup_toolchain vars

packages/addons/addon-depends/multimedia-tools-depends/opencaster/package.mk

@@ -10,7 +10,9 @@ PKG_URL="http://ftp.de.debian.org/debian/pool/main/o/opencaster/opencaster_${PKG
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A free and open source MPEG2 transport stream data generator and packet manipulator."
 
-PKG_MAKE_OPTS_TARGET="CC=$CC"
+pre_configure_target() {
+  PKG_MAKE_OPTS_TARGET="CC=$CC"
+}
 
 pre_makeinstall_target() {
   mkdir -p $PKG_BUILD/.install_pkg

packages/addons/addon-depends/system-tools-depends/getscancodes/package.mk

@@ -10,7 +10,9 @@ PKG_URL="$SOURCEFORGE_SRC/keytouch/getscancodes-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Shows the scancode of the pressed or released key."
 
-PKG_MAKE_OPTS_TARGET="CC=$CC"
+pre_configure_target() {
+  PKG_MAKE_OPTS_TARGET="CC=$CC"
+}
 
 makeinstall_target() {
   : # nop

packages/addons/service/net-snmp/package.mk

@@ -19,7 +19,8 @@ PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Net-SNMP"
 PKG_ADDON_TYPE="xbmc.service"
 
-PKG_CONFIGURE_OPTS_TARGET="--with-defaults \
+configure_package() {
+  PKG_CONFIGURE_OPTS_TARGET="--with-defaults \
         --disable-applications \
         --disable-manuals \
         --disable-debugging \
@@ -40,6 +41,7 @@ PKG_CONFIGURE_OPTS_TARGET="--with-defaults \
         --libdir=/storage/.kodi/addons/${PKG_ADDON_ID}/lib \
         --disable-embedded-perl \
         --with-sysroot=$SYSROOT_PREFIX"
+}
 
 make_target() {
   make

packages/addons/service/tvheadend42/package.mk

@@ -46,37 +46,37 @@ if [[ "$TARGET_ARCH" != "x86_64" ]]; then
     --disable-libx265"
 fi
 
-PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
-                           --arch=$TARGET_ARCH \
-                           --cpu=$TARGET_CPU \
-                           --cc=$CC \
-                           $PKG_TVH_TRANSCODING \
-                           --enable-avahi \
-                           --enable-bundle \
-                           --disable-dbus_1 \
-                           --enable-dvbcsa \
-                           --enable-dvben50221 \
-                           --disable-dvbscan \
-                           --enable-hdhomerun_client \
-                           --disable-hdhomerun_static \
-                           --enable-epoll \
-                           --enable-inotify \
-                           --enable-pngquant \
-                           --disable-libmfx_static \
-                           --disable-nvenc \
-                           --disable-uriparser \
-                           --enable-tvhcsa \
-                           --enable-trace \
-                           --nowerror \
-                           --disable-bintray_cache \
-                           --python=$TOOLCHAIN/bin/python"
-
 post_unpack() {
   sed -e 's/VER="0.0.0~unknown"/VER="'$PKG_VERSION_NUMBER' ~ LibreELEC Tvh-addon v'$ADDON_VERSION'.'$PKG_REV'"/g' -i $PKG_BUILD/support/version
   sed -e 's|'/usr/bin/pngquant'|'$TOOLCHAIN/bin/pngquant'|g' -i $PKG_BUILD/support/mkbundle
 }
 
 pre_configure_target() {
+  PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
+                             --arch=$TARGET_ARCH \
+                             --cpu=$TARGET_CPU \
+                             --cc=$CC \
+                             $PKG_TVH_TRANSCODING \
+                             --enable-avahi \
+                             --enable-bundle \
+                             --disable-dbus_1 \
+                             --enable-dvbcsa \
+                             --enable-dvben50221 \
+                             --disable-dvbscan \
+                             --enable-hdhomerun_client \
+                             --disable-hdhomerun_static \
+                             --enable-epoll \
+                             --enable-inotify \
+                             --enable-pngquant \
+                             --disable-libmfx_static \
+                             --disable-nvenc \
+                             --disable-uriparser \
+                             --enable-tvhcsa \
+                             --enable-trace \
+                             --nowerror \
+                             --disable-bintray_cache \
+                             --python=$TOOLCHAIN/bin/python"
+
 # fails to build in subdirs
   cd $PKG_BUILD
   rm -rf .$TARGET_NAME

packages/lang/llvm/package.mk

@@ -39,6 +39,15 @@ PKG_CMAKE_OPTS_COMMON="-DLLVM_INCLUDE_TOOLS=ON \
 PKG_CMAKE_OPTS_HOST="$PKG_CMAKE_OPTS_COMMON \
                      -DCMAKE_INSTALL_RPATH=$TOOLCHAIN/lib"
 
+pre_configure_target() {
+  PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_COMMON \
+                         -DCMAKE_BUILD_TYPE=MinSizeRel \
+                         -DCMAKE_C_FLAGS="$CFLAGS" \
+                         -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+                         -DLLVM_TARGET_ARCH="$TARGET_ARCH" \
+                         -DLLVM_TABLEGEN=$TOOLCHAIN/bin/llvm-tblgen"
+}
+
 make_host() {
   ninja llvm-config llvm-tblgen
 }
@@ -48,13 +57,6 @@ makeinstall_host() {
   cp -a bin/llvm-tblgen $TOOLCHAIN/bin
 }
 
-PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_COMMON \
-                       -DCMAKE_BUILD_TYPE=MinSizeRel \
-                       -DCMAKE_C_FLAGS="$CFLAGS" \
-                       -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-                       -DLLVM_TARGET_ARCH="$TARGET_ARCH" \
-                       -DLLVM_TABLEGEN=$TOOLCHAIN/bin/llvm-tblgen"
-
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
   rm -rf $INSTALL/usr/lib/LLVMHello.so

packages/security/libgcrypt/package.mk

@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libgcrypt"
 PKG_VERSION="1.8.3"
@@ -13,12 +14,14 @@ PKG_TOOLCHAIN="autotools"
 # libgcrypt-1.7.x fails to build with LTO support
 # see for example https://bugs.gentoo.org/show_bug.cgi?id=581114
 
-PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC \
+pre_configure_target() {
-                           ac_cv_sys_symbol_underscore=no \
+  PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC \
-                           --enable-asm \
+                             ac_cv_sys_symbol_underscore=no \
-                           --with-gnu-ld \
+                             --enable-asm \
-                           --with-libgpg-error-prefix=$SYSROOT_PREFIX/usr \
+                             --with-gnu-ld \
-                           --disable-doc"
+                             --with-libgpg-error-prefix=$SYSROOT_PREFIX/usr \
+                             --disable-doc"
+}
 
 post_makeinstall_target() {
   sed -e "s:\(['= ]\)\"/usr:\\1\"$SYSROOT_PREFIX/usr:g" -i src/$PKG_NAME-config

packages/security/libgpg-error/package.mk

@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libgpg-error"
 PKG_VERSION="1.27"
@@ -10,9 +11,9 @@ PKG_URL="https://www.gnupg.org/ftp/gcrypt/libgpg-error/$PKG_NAME-$PKG_VERSION.ta
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A library that defines common error values for all GnuPG components."
 
-PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC --enable-static --disable-shared --disable-nls --disable-rpath --with-gnu-ld --with-pic"
-
 pre_configure_target() {
+  PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC --enable-static --disable-shared --disable-nls --disable-rpath --with-gnu-ld --with-pic"
+
 # inspired by openembedded
   case ${TARGET_ARCH} in
     aarch64)

packages/sysutils/e2fsprogs/package.mk

@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="e2fsprogs"
 PKG_VERSION="1.43.9"
@@ -20,32 +21,37 @@ PKG_CONFIGURE_OPTS_HOST="--prefix=$TOOLCHAIN/ \
                          --bindir=$TOOLCHAIN/bin \
                          --sbindir=$TOOLCHAIN/sbin"
 
-PKG_CONFIGURE_OPTS_TARGET="BUILD_CC=$HOST_CC \
+pre_configure_target() {
-                           --enable-verbose-makecmds \
+  PKG_CONFIGURE_OPTS_TARGET="BUILD_CC=$HOST_CC \
-                           --enable-symlink-install \
+                             --enable-verbose-makecmds \
-                           --enable-symlink-build \
+                             --enable-symlink-install \
-                           --disable-elf-shlibs \
+                             --enable-symlink-build \
-                           --disable-bsd-shlibs \
+                             --disable-elf-shlibs \
-                           --disable-profile \
+                             --disable-bsd-shlibs \
-                           --disable-jbd-debug \
+                             --disable-profile \
-                           --disable-blkid-debug \
+                             --disable-jbd-debug \
-                           --disable-testio-debug \
+                             --disable-blkid-debug \
-                           --enable-libuuid \
+                             --disable-testio-debug \
-                           --enable-libblkid \
+                             --enable-libuuid \
-                           --disable-debugfs \
+                             --enable-libblkid \
-                           --disable-imager \
+                             --disable-debugfs \
-                           --enable-resizer \
+                             --disable-imager \
-                           --enable-fsck \
+                             --enable-resizer \
-                           --disable-e2initrd-helper \
+                             --enable-fsck \
-                           --enable-tls \
+                             --disable-e2initrd-helper \
-                           --disable-uuidd \
+                             --enable-tls \
-                           --disable-nls \
+                             --disable-uuidd \
-                           --disable-rpath \
+                             --disable-nls \
-                           --disable-fuse2fs \
+                             --disable-rpath \
-                           --with-gnu-ld"
+                             --disable-fuse2fs \
+                             --with-gnu-ld"
+}
 
-PKG_CONFIGURE_OPTS_INIT="$PKG_CONFIGURE_OPTS_TARGET"
+pre_configure_init() {
+  pkg_call pre_configure_target || die "pre_configure_target not found"
 
+  PKG_CONFIGURE_OPTS_INIT="$PKG_CONFIGURE_OPTS_TARGET"
+}
 
 post_makeinstall_target() {
   make -C lib/et LIBMODE=644 DESTDIR=$SYSROOT_PREFIX install