diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk
index 29fc670c09..c856ee241e 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk
@@ -27,11 +27,5 @@ PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
 PKG_SECTION="python"
 PKG_SHORTDESC="Adafruit Python ADS1x15 Library"
 PKG_LONGDESC="Python code to use the ADS1015 and ADS1115 analog to digital converters with a Raspberry Pi or BeagleBone black."
+PKG_TOOLCHAIN="manual"
 
-make_target() {
-  : # nop
-}
-
-makeinstall_target() {
-  : # nop
-}
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk
index e9b156f98f..3904513c99 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk
@@ -27,11 +27,4 @@ PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
 PKG_SECTION="python"
 PKG_SHORTDESC="Adafruit Python ADXL345 Library"
 PKG_LONGDESC="Python code to use the ADXL345 triple-axis accelerometer over I2C with a Raspberry Pi or BeagleBone Black."
-
-make_target() {
-  : # nop
-}
-
-makeinstall_target() {
-  : # nop
-}
+PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk
index cd7b34dc93..bd8b4083b8 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk
@@ -27,11 +27,4 @@ PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
 PKG_SECTION="python"
 PKG_SHORTDESC="Adafruit Python BMP Library"
 PKG_LONGDESC="Python library for accessing the BMP series pressure and temperature sensors like the BMP085/BMP180 on a Raspberry Pi or Beaglebone Black."
-
-make_target() {
-  : # nop
-}
-
-makeinstall_target() {
-  : # nop
-}
+PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk
index e5b20eadd7..86f9fcc7c5 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk
@@ -27,11 +27,4 @@ PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
 PKG_SECTION="python"
 PKG_SHORTDESC="Adafruit Python CharLCD Library"
 PKG_LONGDESC="Python library for accessing Adafruit character LCDs from a Raspberry Pi or BeagleBone Black."
-
-make_target() {
-  : # nop
-}
-
-makeinstall_target() {
-  : # nop
-}
+PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk
index 9581e04d52..78e805aea2 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk
@@ -27,17 +27,7 @@ PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
 PKG_SECTION="python"
 PKG_SHORTDESC="Adafruit Python DHT Library"
 PKG_LONGDESC="Python library to read the DHT series of humidity and temperature sensors on a Raspberry Pi or Beaglebone Black."
-
-case "$PROJECT:$DEVICE" in
-  "RPi:RPi")
-    RPI_VERSION="--force-pi"
-    ;;
-  "RPi:RPi2")
-    RPI_VERSION="--force-pi2"
-    ;;
-  *)
-    RPI_VERSION=""
-esac
+PKG_TOOLCHAIN="manual"
 
 pre_make_target() {
   export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
@@ -45,9 +35,16 @@ pre_make_target() {
 }
 
 make_target() {
-  python setup.py build $RPI_VERSION --cross-compile
-}
+  case "$PROJECT:$DEVICE" in
+    "RPi:RPi")
+      PKG_RPI_VERSION="--force-pi"
+      ;;
+    "RPi:RPi2")
+      PKG_RPI_VERSION="--force-pi2"
+      ;;
+    *)
+      PKG_RPI_VERSION=""
+  esac
 
-makeinstall_target() {
-  : # nop
+  python setup.py build $PKG_RPI_VERSION --cross-compile
 }
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk
index 5c49029782..e0ebd21571 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk
@@ -27,11 +27,4 @@ PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
 PKG_SECTION="python"
 PKG_SHORTDESC="Adafruit Python GPIO Library"
 PKG_LONGDESC="Library to provide a cross-platform GPIO interface on the Raspberry Pi and Beaglebone Black using the RPi.GPIO and Adafruit_BBIO librarie"
-
-make_target() {
-  : # nop
-}
-
-makeinstall_target() {
-  : # nop
-}
+PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk
index c0d5792757..f209b521bc 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk
@@ -27,11 +27,4 @@ PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
 PKG_SECTION="python"
 PKG_SHORTDESC="Python library for controlling LED backpack displays."
 PKG_LONGDESC="Python library for controlling LED backpack displays such as 8x8 matrices, bar graphs, and 7/14-segment displays on a Raspberry Pi or BeagleBone Black."
-
-make_target() {
-  : # nop
-}
-
-makeinstall_target() {
-  : # nop
-}
+PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk
index 5049a8deeb..df559e9012 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk
@@ -27,11 +27,4 @@ PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
 PKG_SECTION="python"
 PKG_SHORTDESC="Adafruit Python LSM303 Library"
 PKG_LONGDESC="Python code to use the LSM303 accelerometer & magnetometer with Raspberry Pi & BeagleBone Black."
-
-make_target() {
-  : # nop
-}
-
-makeinstall_target() {
-  : # nop
-}
+PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk
index a95af330c7..2e349b8ad2 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk
@@ -27,11 +27,4 @@ PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
 PKG_SECTION="python"
 PKG_SHORTDESC="Adafruit Python MCP3008 Library"
 PKG_LONGDESC="Python code to use the MCP3008 analog to digital converter with a Raspberry Pi or BeagleBone black."
-
-make_target() {
-  : # nop
-}
-
-makeinstall_target() {
-  : # nop
-}
+PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk
index 02dfa76b4f..3dfad8775a 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk
@@ -27,11 +27,4 @@ PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
 PKG_SECTION="python"
 PKG_SHORTDESC="Adafruit Python MCP4725 Library"
 PKG_LONGDESC="Python code to use the MCP4725 digital to analog converter with a Raspberry Pi or BeagleBone black."
-
-make_target() {
-  : # nop
-}
-
-makeinstall_target() {
-  : # nop
-}
+PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk
index 127f8ee3fd..88fca5fbf8 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk
@@ -27,11 +27,4 @@ PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
 PKG_SECTION="python"
 PKG_SHORTDESC="Adafruit Python PCA9685 Library"
 PKG_LONGDESC="Python code to use the PCA9685 PWM servo/LED controller with a Raspberry Pi or BeagleBone black."
-
-make_target() {
-  : # nop
-}
-
-makeinstall_target() {
-  : # nop
-}
+PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk
index 8de231d41b..bef4f1b013 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk
@@ -27,11 +27,4 @@ PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
 PKG_SECTION="python"
 PKG_SHORTDESC="Pure python access to Linux IO including I2C and SPI."
 PKG_LONGDESC="Pure python access to Linux IO including I2C and SPI. Drop in replacement for smbus and spidev modules."
-
-make_target() {
-  : # nop
-}
-
-makeinstall_target() {
-  : # nop
-}
+PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk
index b4406aea95..44545064de 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk
@@ -28,11 +28,4 @@ PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
 PKG_SECTION="python"
 PKG_SHORTDESC="Python library for the SI1145"
 PKG_LONGDESC="Python library for accessing the SI1145 temperature sensor on a Raspberry Pi"
-
-make_target() {
-  : # nop
-}
-
-makeinstall_target() {
-  : # nop
-}
+PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SSD1306/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SSD1306/package.mk
index 54c2a2fb2f..94607d285f 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SSD1306/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SSD1306/package.mk
@@ -27,11 +27,4 @@ PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
 PKG_SECTION="python"
 PKG_SHORTDESC="Adafruit Python SSD1306 Library"
 PKG_LONGDESC="SSD1306 oled driver library for 'monochrome' 128x64 and 128x32 OLEDs."
-
-make_target() {
-  : # nop
-}
-
-makeinstall_target() {
-  : # nop
-}
+PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk
index dee5cab8c6..4b9c8c4ff6 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk
@@ -27,11 +27,4 @@ PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
 PKG_SECTION="python"
 PKG_SHORTDESC="Adafruit Python TCS34725 Library"
 PKG_LONGDESC="Python code to use the TCS34725 color sensor with the Raspberry Pi & BeagleBone Black."
-
-make_target() {
-  : # nop
-}
-
-makeinstall_target() {
-  : # nop
-}
+PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk
index 6bc47dac86..de132e7910 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk
@@ -27,11 +27,4 @@ PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
 PKG_SECTION="python"
 PKG_SHORTDESC="Adafruit Python VCNL40xx Library"
 PKG_LONGDESC="Python code to use the VCNL4000 & VCNL4010 proximity sensors with the Raspberry Pi & BeagleBone Black."
-
-make_target() {
-  : # nop
-}
-
-makeinstall_target() {
-  : # nop
-}
+PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk
index 82c2602e7a..4c57b22ab9 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk
@@ -27,11 +27,4 @@ PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
 PKG_SECTION="python"
 PKG_SHORTDESC="Adafruit Python WS2801 Library"
 PKG_LONGDESC="Python code to control WS2801 and similar SPI interface addressable RGB LED strips on a Raspberry Pi & BeagleBone Black."
-
-make_target() {
-  : # nop
-}
-
-makeinstall_target() {
-  : # nop
-}
+PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/containerd/package.mk b/packages/addons/addon-depends/containerd/package.mk
index d12e443040..db28a6ec07 100644
--- a/packages/addons/addon-depends/containerd/package.mk
+++ b/packages/addons/addon-depends/containerd/package.mk
@@ -27,6 +27,7 @@ PKG_DEPENDS_TARGET="toolchain go:host"
 PKG_SECTION="system"
 PKG_SHORTDESC="containerd is a daemon to control runC"
 PKG_LONGDESC="containerd is a daemon to control runC, built for performance and density. containerd leverages runC's advanced features such as seccomp and user namespace support as well as checkpoint and restore for cloning and live migration of containers."
+PKG_TOOLCHAIN="manual"
 
 pre_make_target() {
   case $TARGET_ARCH in
@@ -68,7 +69,3 @@ make_target() {
   $GOLANG build -v -o bin/containerd      -a -tags "static_build" -ldflags "$LDFLAGS" ./containerd
   $GOLANG build -v -o bin/containerd-shim -a -tags "static_build" -ldflags "$LDFLAGS" ./containerd-shim
 }
-
-makeinstall_target() {
-  :
-}
diff --git a/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk b/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk
deleted file mode 100644
index 60c04e3264..0000000000
--- a/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk
+++ /dev/null
@@ -1,112 +0,0 @@
-################################################################################
-#      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016-present Team LibreELEC
-#
-#  LibreELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  LibreELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-PKG_NAME="ffmpegx"
-PKG_VERSION="libreelec"
-PKG_REV="8"
-PKG_ARCH="any"
-PKG_LICENSE="LGPLv2.1+"
-PKG_SITE="https://ffmpeg.org"
-PKG_DEPENDS_TARGET="toolchain ffmpeg lame x264"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="FFmpeg+"
-PKG_LONGDESC="FFmpeg built static with additional features"
-PKG_TOOLCHAIN="configure"
-
-pre_configure_target() {
-  cd "$PKG_BUILD"
-  rm -rf ".$TARGET_NAME"
-  cp -PR $(get_build_dir ffmpeg)/* .
-  make clean
-
-# ffmpeg builds better with these options
-  strip_gold
-  strip_lto
-
-  if [ "$KODIPLAYER_DRIVER" == "bcm2835-driver" ]; then
-    CFLAGS="-DRPI=1 -I$SYSROOT_PREFIX/usr/include/IL -I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux $CFLAGS"
-    FFMPEG_LIBS="-lbcm_host -ldl -lmmal -lmmal_core -lmmal_util -lvchiq_arm -lvcos -lvcsm"
-    FFMPEG_RPI_HADE="--enable-mmal --enable-omx-rpi"
-  fi
-
-# ffmpeg does not build with libx264 on aarch64
-  if [ "$TARGET_ARCH" != "aarch64" ]; then
-    FFMPEG_X264="--enable-libx264"
-  fi
-
-  if [ "$TARGET_ARCH" == "arm" ]; then
-    FFMPEG_ARM_AO="--enable-hardcoded-tables"
-  fi
-}
-
-configure_target() {
-  ./configure \
-    \
-    `#Licensing options` \
-    --enable-gpl \
-    --enable-nonfree \
-    \
-    `#Documentation options` \
-    --disable-doc \
-    \
-    `#Hardware accelerated decoding encoding` \
-    $FFMPEG_RPI_HADE \
-    \
-    `#External library support` \
-    --enable-libmp3lame \
-    $FFMPEG_X264 \
-    --enable-openssl \
-    \
-    `#Toolchain options` \
-    --arch="$TARGET_ARCH" \
-    --cpu="$TARGET_CPU" \
-    --cross-prefix="$TARGET_PREFIX" \
-    --enable-cross-compile \
-    --sysroot="$SYSROOT_PREFIX" \
-    --sysinclude="$SYSROOT_PREFIX/usr/include" \
-    --target-os="linux" \
-    --nm="$NM" \
-    --ar="$AR" \
-    --as="$CC" \
-    --cc="$CC" \
-    --ld="$CC" \
-    --pkg-config="$TOOLCHAIN/bin/pkg-config" \
-    --host-cc="$HOST_CC" \
-    --host-cflags="$HOST_CFLAGS" \
-    --host-ldflags="$HOST_LDFLAGS" \
-    --host-libs="-lm" \
-    --extra-cflags="$CFLAGS" \
-    --extra-ldflags="$LDFLAGS" \
-    --extra-libs="$FFMPEG_LIBS" \
-    --extra-version="x" \
-    --enable-pic \
-    \
-    `#Advanced options` \
-    $FFMPEG_ARM_AO \
-
-}
-
-makeinstall_target() {
-  make install DESTDIR=$INSTALL
-}
-
-post_makeinstall_target() {
-  for ff in $INSTALL/usr/local/bin/*; do mv $ff ${ff}x; done
-  rm -fr $INSTALL/usr/local/include
-  rm -fr $INSTALL/usr/local/share/ffmpeg/examples
-}
diff --git a/packages/addons/addon-depends/ffmpegx-depends/fdk-aac/package.mk b/packages/addons/addon-depends/ffmpegx-depends/fdk-aac/package.mk
index 7ef2b8c252..d669c19d11 100644
--- a/packages/addons/addon-depends/ffmpegx-depends/fdk-aac/package.mk
+++ b/packages/addons/addon-depends/ffmpegx-depends/fdk-aac/package.mk
@@ -26,4 +26,4 @@ PKG_URL="https://github.com/mstorsjo/fdk-aac/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="multimedia"
 PKG_LONGDESC="A standalone library of the Fraunhofer FDK AAC code from Android."
-PKG_AUTORECONF="yes"
+PKG_TOOLCHAIN="autotools"
diff --git a/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk b/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk
index 3111a963a3..acd6fd8f9b 100644
--- a/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk
+++ b/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk
@@ -26,6 +26,7 @@ PKG_URL="https://github.com/videolan/x265/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="multimedia"
 PKG_LONGDESC="x265 is a H.265/HEVC video encoder application library"
+PKG_TOOLCHAIN="make"
 
 pre_configure_target() {
   LDFLAGS="$LDFLAGS -ldl"
diff --git a/packages/addons/addon-depends/libnetwork/package.mk b/packages/addons/addon-depends/libnetwork/package.mk
index 3f5998b0df..1fdb25fc2a 100644
--- a/packages/addons/addon-depends/libnetwork/package.mk
+++ b/packages/addons/addon-depends/libnetwork/package.mk
@@ -27,6 +27,7 @@ PKG_DEPENDS_TARGET="toolchain go:host"
 PKG_SECTION="system"
 PKG_SHORTDESC="Libnetwork provides a native Go implementation for connecting containers"
 PKG_LONGDESC="Libnetwork provides a native Go implementation for connecting containers"
+PKG_TOOLCHAIN="manual"
 
 pre_make_target() {
   case $TARGET_ARCH in
@@ -65,7 +66,3 @@ make_target() {
   mkdir -p bin
   $GOLANG build -v -o bin/docker-proxy -a -ldflags "$LDFLAGS" ./cmd/proxy
 }
-
-makeinstall_target() {
-  :
-}
diff --git a/packages/addons/addon-depends/moby/package.mk b/packages/addons/addon-depends/moby/package.mk
index 982def278b..0481fde84e 100644
--- a/packages/addons/addon-depends/moby/package.mk
+++ b/packages/addons/addon-depends/moby/package.mk
@@ -26,7 +26,7 @@ PKG_DEPENDS_TARGET="toolchain sqlite go:host containerd runc libnetwork tini"
 PKG_SECTION="service/system"
 PKG_SHORTDESC="Moby is an open-source engine that automates the deployment of any application as a lightweight, portable, self-sufficient container that will run virtually anywhere."
 PKG_LONGDESC="Docker containers can encapsulate any payload, and will run consistently on and between virtually any server. The same container that a developer builds and tests on a laptop will run at scale, in production*, on VMs, bare-metal servers, OpenStack clusters, public instances, or combinations of the above. Moby as the central part of the Docker engine"
-PKG_AUTORECONF="no"
+PKG_TOOLCHAIN="manual"
 
 configure_target() {
   export DOCKER_BUILDTAGS="daemon \
@@ -85,8 +85,3 @@ make_target() {
   $GOLANG build -v -o bin/docker -a -tags "$DOCKER_BUILDTAGS" -ldflags "$LDFLAGS" ./cmd/docker
   $GOLANG build -v -o bin/dockerd -a -tags "$DOCKER_BUILDTAGS" -ldflags "$LDFLAGS" ./cmd/dockerd
 }
-
-makeinstall_target() {
-  :
-}
-
diff --git a/packages/addons/addon-depends/rpi-tools-depends/RPi.GPIO/package.mk b/packages/addons/addon-depends/rpi-tools-depends/RPi.GPIO/package.mk
index 99e4c1f138..aa9cd99866 100644
--- a/packages/addons/addon-depends/rpi-tools-depends/RPi.GPIO/package.mk
+++ b/packages/addons/addon-depends/rpi-tools-depends/RPi.GPIO/package.mk
@@ -27,6 +27,7 @@ PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
 PKG_SECTION="python"
 PKG_SHORTDESC="A module to control Raspberry Pi GPIO channels"
 PKG_LONGDESC="A module to control Raspberry Pi GPIO channels"
+PKG_TOOLCHAIN="manual"
 
 pre_configure_target() {
   export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
@@ -37,7 +38,3 @@ pre_configure_target() {
 make_target() {
   python setup.py build
 }
-
-makeinstall_target() {
-  : # nop
-}
diff --git a/packages/addons/addon-depends/rpi-tools-depends/gpiozero/package.mk b/packages/addons/addon-depends/rpi-tools-depends/gpiozero/package.mk
index b3e5038b32..4a47de6422 100644
--- a/packages/addons/addon-depends/rpi-tools-depends/gpiozero/package.mk
+++ b/packages/addons/addon-depends/rpi-tools-depends/gpiozero/package.mk
@@ -27,11 +27,4 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="python"
 PKG_SHORTDESC="A simple interface to everyday GPIO components used with Raspberry Pi"
 PKG_LONGDESC="A simple interface to everyday GPIO components used with Raspberry Pi"
-
-make_target() {
-  : # nop
-}
-
-makeinstall_target() {
-  : # nop
-}
+PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/rpi-tools-depends/lan951x-led-ctl/package.mk b/packages/addons/addon-depends/rpi-tools-depends/lan951x-led-ctl/package.mk
index 151ab5d7bb..cab18f4c40 100644
--- a/packages/addons/addon-depends/rpi-tools-depends/lan951x-led-ctl/package.mk
+++ b/packages/addons/addon-depends/rpi-tools-depends/lan951x-led-ctl/package.mk
@@ -27,6 +27,7 @@ PKG_DEPENDS_TARGET="toolchain libusb"
 PKG_SECTION="rpi-tools"
 PKG_SHORTDESC="Control LEDs connected to LAN9512/LAN9514 ethernet USB controllers"
 PKG_LONGDESC="Control LEDs connected to LAN9512/LAN9514 ethernet USB controllers"
+PKG_TOOLCHAIN="manual"
 
 make_target() {
   $CC -std=c11 -I./include -Wall -Wstrict-prototypes -Wconversion \
@@ -35,7 +36,3 @@ make_target() {
 
   $STRIP lan951x-led-ctl
 }
-
-makeinstall_target() {
-  : # nop
-}
diff --git a/packages/addons/addon-depends/rpi-tools-depends/picamera/package.mk b/packages/addons/addon-depends/rpi-tools-depends/picamera/package.mk
index 96f9f53c53..fb12550caa 100644
--- a/packages/addons/addon-depends/rpi-tools-depends/picamera/package.mk
+++ b/packages/addons/addon-depends/rpi-tools-depends/picamera/package.mk
@@ -27,11 +27,4 @@ PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host bcm2835-driver"
 PKG_SECTION="python"
 PKG_SHORTDESC="A python and shell interface for the Raspberry Pi camera module"
 PKG_LONGDESC="A python and shell interface for the Raspberry Pi camera module"
-
-make_target() {
-  : # nop
-}
-
-makeinstall_target() {
-  : # nop
-}
+PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/runc/package.mk b/packages/addons/addon-depends/runc/package.mk
index d86d764be1..366150b4e1 100644
--- a/packages/addons/addon-depends/runc/package.mk
+++ b/packages/addons/addon-depends/runc/package.mk
@@ -27,6 +27,7 @@ PKG_DEPENDS_TARGET="toolchain go:host"
 PKG_SECTION="system"
 PKG_SHORTDESC="runc is a CLI tool for spawning and running containers according to the OCI specification"
 PKG_LONGDESC="runc is a CLI tool for spawning and running containers according to the OCI specification"
+PKG_TOOLCHAIN="manual"
 
 pre_make_target() {
   case $TARGET_ARCH in
@@ -67,7 +68,3 @@ make_target() {
   mkdir -p bin
   $GOLANG build -v -o bin/runc -a -tags "cgo static_build" -ldflags "$LDFLAGS" ./
 }
-
-makeinstall_target() {
-  :
-}
diff --git a/packages/addons/addon-depends/system-tools-depends/nmon/package.mk b/packages/addons/addon-depends/system-tools-depends/nmon/package.mk
index f2fb706827..98cd049979 100644
--- a/packages/addons/addon-depends/system-tools-depends/nmon/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/nmon/package.mk
@@ -26,6 +26,7 @@ PKG_URL="https://github.com/axibase/nmon/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses"
 PKG_SECTION="tools"
 PKG_SHORTDESC="Systems administrator, tuner, benchmark tool gives you a huge amount of important performance information in one go"
+PKG_TOOLCHAIN="manual"
 
 make_target() {
   case $ARCH in
@@ -40,7 +41,3 @@ make_target() {
   LDFLAGS="$LDFLAGS -lncurses -lm -g"
   $CC -o nmon lmon*.c $CFLAGS $LDFLAGS -D $arch -D KERNEL_2_6_18
 }
-
-makeinstall_target() {
-  :
-}
diff --git a/packages/addons/driver/sapphire/package.mk b/packages/addons/driver/sapphire/package.mk
index 9a566fee9a..520e01ddbd 100644
--- a/packages/addons/driver/sapphire/package.mk
+++ b/packages/addons/driver/sapphire/package.mk
@@ -28,6 +28,7 @@ PKG_DEPENDS_TARGET="toolchain linux bash"
 PKG_SECTION="driver.remote"
 PKG_SHORTDESC="A Linux driver to add support for sapphire remotes"
 PKG_LONGDESC="A Linux driver to add support for sapphire remotes"
+PKG_TOOLCHAIN="manual"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Sapphire Remote Driver"
@@ -62,10 +63,6 @@ post_make_target() {
          sapphire_startup.sh sapphire_keymap.sh
 }
 
-makeinstall_target() {
-  :
-}
-
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/
     cp $PKG_BUILD/*.ko $ADDON_BUILD/$PKG_ADDON_ID/lib
diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk
index 92995b6e2c..a3e3a60d90 100644
--- a/packages/addons/service/docker/package.mk
+++ b/packages/addons/service/docker/package.mk
@@ -27,19 +27,12 @@ PKG_DEPENDS_TARGET="toolchain moby"
 PKG_SECTION="service/system"
 PKG_SHORTDESC="Docker is an open-source engine that automates the deployment of any application as a lightweight, portable, self-sufficient container that will run virtually anywhere."
 PKG_LONGDESC="Docker containers can encapsulate any payload, and will run consistently on and between virtually any server. The same container that a developer builds and tests on a laptop will run at scale, in production*, on VMs, bare-metal servers, OpenStack clusters, public instances, or combinations of the above."
+PKG_TOOLCHAIN="manual"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Docker"
 PKG_ADDON_TYPE="xbmc.service"
 
-make_target() {
-  : # nop
-}
-
-makeinstall_target() {
-  : # nop
-}
-
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
     cp -P $(get_build_dir moby)/bin/docker $ADDON_BUILD/$PKG_ADDON_ID/bin
diff --git a/packages/addons/service/slice/package.mk b/packages/addons/service/slice/package.mk
index 76d2d37341..d512b3a69b 100644
--- a/packages/addons/service/slice/package.mk
+++ b/packages/addons/service/slice/package.mk
@@ -27,20 +27,13 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="service"
 PKG_SHORTDESC="Provides the ability to change the led lights on the Slice box via Kodi actions"
 PKG_LONGDESC="Provides the ability to change the led lights on the Slice box via Kodi actions"
+PKG_TOOLCHAIN="manual"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Slice"
 PKG_ADDON_PROJECTS="Slice Slice3"
 PKG_ADDON_TYPE="xbmc.service"
 
-make_target() {
-  :
-}
-
-makeinstall_target() {
-  :
-}
-
 addon() {
   :
 }
diff --git a/packages/audio/rpi-cirrus-config/package.mk b/packages/audio/rpi-cirrus-config/package.mk
index 28f989e9a5..4b4b310443 100644
--- a/packages/audio/rpi-cirrus-config/package.mk
+++ b/packages/audio/rpi-cirrus-config/package.mk
@@ -27,10 +27,7 @@ PKG_DEPENDS_TARGET="alsa-utils"
 PKG_SECTION="driver"
 PKG_SHORTDESC="Config scripts for the Wolfson/Cirrus Logic audio card"
 PKG_LONGDESC="Config scripts for the Wolfson/Cirrus Logic audio card"
-
-make_target() {
- : #
-}
+PKG_TOOLCHAIN="manual"
 
 makeinstall_target() {
   mkdir -p $INSTALL/usr/lib/udev
diff --git a/packages/devel/configtools/package.mk b/packages/devel/configtools/package.mk
index 6a4c2ddbf4..ef06d78964 100644
--- a/packages/devel/configtools/package.mk
+++ b/packages/devel/configtools/package.mk
@@ -24,10 +24,7 @@ PKG_SOURCE_DIR="$PKG_VERSION*"
 PKG_DEPENDS_HOST=""
 PKG_SHORTDESC="configtools"
 PKG_LONGDESC="configtools"
-
-make_host() {
-  :
-}
+PKG_TOOLCHAIN="manual"
 
 makeinstall_host() {
   mkdir -p $TOOLCHAIN/configtools
diff --git a/packages/emulation/cyclone68000/package.mk b/packages/emulation/cyclone68000/package.mk
index a0ee674a72..7985e6be81 100644
--- a/packages/emulation/cyclone68000/package.mk
+++ b/packages/emulation/cyclone68000/package.mk
@@ -27,11 +27,4 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="emulation"
 PKG_SHORTDESC="Motorola 68000 emulator written in ARM assembly"
 PKG_LONGDESC="Motorola 68000 emulator written in ARM assembly"
-
-make_target() {
-  :
-}
-
-makeinstall_target() {
-  :
-}
+PKG_TOOLCHAIN="manual"
diff --git a/packages/emulation/libretro-hatari/package.mk b/packages/emulation/libretro-hatari/package.mk
index 9b68112435..7094e3d88c 100644
--- a/packages/emulation/libretro-hatari/package.mk
+++ b/packages/emulation/libretro-hatari/package.mk
@@ -28,15 +28,12 @@ PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_SECTION="emulation"
 PKG_SHORTDESC="game.libretro.hatari: hatari for Kodi"
 PKG_LONGDESC="game.libretro.hatari: hatari for Kodi"
+PKG_TOOLCHAIN="manual"
 
 PKG_LIBNAME="hatari_libretro.so"
 PKG_LIBPATH="$PKG_LIBNAME"
 PKG_LIBVAR="HATARI_LIB"
 
-configure_target(){
-  :
-}
-
 make_target() {
   cd $PKG_BUILD
   make -f Makefile.libretro
diff --git a/packages/emulation/libretro-pcsx-rearmed/package.mk b/packages/emulation/libretro-pcsx-rearmed/package.mk
index 000e1238d2..5b38780967 100644
--- a/packages/emulation/libretro-pcsx-rearmed/package.mk
+++ b/packages/emulation/libretro-pcsx-rearmed/package.mk
@@ -28,15 +28,12 @@ PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_SECTION="emulation"
 PKG_SHORTDESC="game.libretro.pcsx-rearmed: PCSX Rearmed for Kodi"
 PKG_LONGDESC="game.libretro.pcsx-rearmed: PCSX Rearmed for Kodi"
+PKG_TOOLCHAIN="manual"
 
 PKG_LIBNAME="pcsx_rearmed_libretro.so"
 PKG_LIBPATH="$PKG_LIBNAME"
 PKG_LIBVAR="PCSX-REARMED_LIB"
 
-configure_target() {
-  :
-}
-
 pre_make_target() {
   strip_gold
 }
diff --git a/packages/emulation/libretro-picodrive/package.mk b/packages/emulation/libretro-picodrive/package.mk
index 3ccffb0063..7930840c8d 100644
--- a/packages/emulation/libretro-picodrive/package.mk
+++ b/packages/emulation/libretro-picodrive/package.mk
@@ -29,6 +29,7 @@ PKG_DEPENDS_HOST="cyclone68000"
 PKG_SECTION="emulation"
 PKG_SHORTDESC="Fast MegaDrive/MegaCD/32X emulator"
 PKG_LONGDESC="Fast MegaDrive/MegaCD/32X emulator"
+PKG_TOOLCHAIN="manual"
 
 PKG_LIBNAME="picodrive_libretro.so"
 PKG_LIBPATH="$PKG_LIBNAME"
@@ -44,20 +45,12 @@ pre_configure_host() {
   rm -rf .$HOST_NAME
 }
 
-configure_host() {
-  :
-}
-
 make_host() {
   if [ "$ARCH" == "arm" ]; then
     make -C cpu/cyclone CONFIG_FILE=../cyclone_config.h
   fi
 }
 
-makeinstall_host() {
-  :
-}
-
 pre_configure_target() {
   # fails to build in subdirs
   cd $PKG_BUILD
diff --git a/packages/emulation/libretro-scummvm/package.mk b/packages/emulation/libretro-scummvm/package.mk
index a3414fb786..0fb78d3134 100644
--- a/packages/emulation/libretro-scummvm/package.mk
+++ b/packages/emulation/libretro-scummvm/package.mk
@@ -28,6 +28,7 @@ PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_SECTION="emulation"
 PKG_SHORTDESC="game.libretro.scummvm: scummvm for Kodi"
 PKG_LONGDESC="game.libretro.scummvm: scummvm for Kodi"
+PKG_TOOLCHAIN="manual"
 
 PKG_LIBNAME="scummvm_libretro.so"
 PKG_LIBPATH="backends/platform/libretro/build/$PKG_LIBNAME"
@@ -37,10 +38,6 @@ pre_configure_target() {
   strip_lto
 }
 
-configure_target() {
-  :
-}
-
 make_target() {
   cd $PKG_BUILD
   CXXFLAGS="$CXXFLAGS -DHAVE_POSIX_MEMALIGN=1"
diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk
index 880eaf7655..5de19e9149 100644
--- a/packages/graphics/bcm2835-driver/package.mk
+++ b/packages/graphics/bcm2835-driver/package.mk
@@ -27,6 +27,7 @@ PKG_DEPENDS_TARGET="toolchain dtc"
 PKG_SECTION="graphics"
 PKG_SHORTDESC="OpenMAX-bcm2835: OpenGL-ES and OpenMAX driver for BCM2835"
 PKG_LONGDESC="OpenMAX-bcm2835: OpenGL-ES and OpenMAX driver for BCM2835"
+PKG_TOOLCHAIN="manual"
 
 if [ "$TARGET_FLOAT" = "softfp" -o "$TARGET_FLOAT" = "soft" ]; then
   FLOAT="softfp"
diff --git a/packages/graphics/imx-gpu-viv/package.mk b/packages/graphics/imx-gpu-viv/package.mk
index f8a47bd0a6..65048c09d9 100644
--- a/packages/graphics/imx-gpu-viv/package.mk
+++ b/packages/graphics/imx-gpu-viv/package.mk
@@ -34,10 +34,7 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="graphics"
 PKG_SHORTDESC="imx-gpu-viv: OpenGL-ES and VIVANTE driver for imx6q"
 PKG_LONGDESC="imx-gpu-viv: OpenGL-ES and VIVANTE driver for imx6q"
-
-make_target() {
- : # nothing to make
-}
+PKG_TOOLCHAIN="manual"
 
 makeinstall_target() {
   mkdir -p $SYSROOT_PREFIX/usr/include
diff --git a/packages/graphics/opengl-meson/package.mk b/packages/graphics/opengl-meson/package.mk
index 7928a0810f..714407861a 100644
--- a/packages/graphics/opengl-meson/package.mk
+++ b/packages/graphics/opengl-meson/package.mk
@@ -41,10 +41,7 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="graphics"
 PKG_SHORTDESC="opengl-meson: OpenGL ES pre-compiled libraries for Mali GPUs found in Amlogic Meson SoCs"
 PKG_LONGDESC="opengl-meson: OpenGL ES pre-compiled libraries for Mali GPUs found in Amlogic Meson SoCs. The libraries could be found in a Linux buildroot released by Amlogic at http://openlinux.amlogic.com:8000/download/ARM/filesystem/. See the opengl package."
-
-make_target() {
- : # nothing todo
-}
+PKG_TOOLCHAIN="manual"
 
 makeinstall_target() {
   mkdir -p $SYSROOT_PREFIX/usr/include
diff --git a/packages/lang/gcc-linaro-aarch64-linux-gnu/package.mk b/packages/lang/gcc-linaro-aarch64-linux-gnu/package.mk
index 29eedf2c8f..57e07bf214 100644
--- a/packages/lang/gcc-linaro-aarch64-linux-gnu/package.mk
+++ b/packages/lang/gcc-linaro-aarch64-linux-gnu/package.mk
@@ -26,11 +26,7 @@ PKG_URL="https://releases.linaro.org/components/toolchain/binaries/7.1-2017.08/a
 PKG_SOURCE_DIR="gcc-linaro-${PKG_VERSION}-x86_64_aarch64-linux-gnu"
 PKG_SECTION="lang"
 PKG_SHORTDESC="Linaro Aarch64 GNU Linux Binary Toolchain"
-PKG_AUTORECONF="no"
-
-make_host() {
-  :
-}
+PKG_TOOLCHAIN="manual"
 
 makeinstall_host() {
   mkdir -p $TOOLCHAIN/lib/gcc-linaro-aarch64-linux-gnu/
diff --git a/packages/linux-drivers/brcmap6xxx-aml/package.mk b/packages/linux-drivers/brcmap6xxx-aml/package.mk
index 3330f9c3ff..da24abd2eb 100644
--- a/packages/linux-drivers/brcmap6xxx-aml/package.mk
+++ b/packages/linux-drivers/brcmap6xxx-aml/package.mk
@@ -28,6 +28,7 @@ PKG_NEED_UNPACK="$LINUX_DEPENDS"
 PKG_SECTION="driver"
 PKG_SHORTDESC="brcmap6xxx-aml: Linux drivers for AP6xxx WLAN chips used in some devices based on Amlogic SoCs"
 PKG_LONGDESC="brcmap6xxx-aml: Linux drivers for AP6xxx WLAN chips used in some devices based on Amlogic SoCs"
+PKG_TOOLCHAIN="manual"
 PKG_IS_KERNEL_PKG="yes"
 
 make_target() {
diff --git a/packages/linux-drivers/gpu-aml/package.mk b/packages/linux-drivers/gpu-aml/package.mk
index 4a2d655546..6bcfbe9b0e 100644
--- a/packages/linux-drivers/gpu-aml/package.mk
+++ b/packages/linux-drivers/gpu-aml/package.mk
@@ -30,6 +30,7 @@ PKG_NEED_UNPACK="$LINUX_DEPENDS"
 PKG_SECTION="driver"
 PKG_SHORTDESC="gpu-aml: Linux drivers for Mali GPUs found in Amlogic Meson SoCs"
 PKG_LONGDESC="gpu-aml: Linux drivers for Mali GPUs found in Amlogic Meson SoCs"
+PKG_TOOLCHAIN="manual"
 PKG_IS_KERNEL_PKG="yes"
 
 make_target() {
diff --git a/packages/linux-drivers/wetekdvb/package.mk b/packages/linux-drivers/wetekdvb/package.mk
index 28088a6edf..2c8d85cd47 100644
--- a/packages/linux-drivers/wetekdvb/package.mk
+++ b/packages/linux-drivers/wetekdvb/package.mk
@@ -29,10 +29,7 @@ PKG_SECTION="driver"
 PKG_SHORTDESC="wetekdvb: Wetek DVB driver"
 PKG_LONGDESC="These package contains Wetek's DVB driver "
 PKG_IS_KERNEL_PKG="yes"
-
-make_target() {
-  : # nothing todo
-}
+PKG_TOOLCHAIN="manual"
 
 makeinstall_target() {
   mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME
diff --git a/packages/network/wireless-regdb/package.mk b/packages/network/wireless-regdb/package.mk
index 2a4923994b..6ab054686f 100644
--- a/packages/network/wireless-regdb/package.mk
+++ b/packages/network/wireless-regdb/package.mk
@@ -27,11 +27,4 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="network"
 PKG_SHORTDESC="wireless-regdb: regulatory database"
 PKG_LONGDESC="wireless-regdb is a regulatory database"
-
-make_target() {
-  : # nothing to do
-}
-
-makeinstall_target() {
-  : # nothing to do
-}
+PKG_TOOLCHAIN="manual"
diff --git a/packages/sysutils/irqbalanced/package.mk b/packages/sysutils/irqbalanced/package.mk
index 8360c6ae7d..30c9dfdb0a 100644
--- a/packages/sysutils/irqbalanced/package.mk
+++ b/packages/sysutils/irqbalanced/package.mk
@@ -27,6 +27,7 @@ PKG_DEPENDS_TARGET="toolchain systemd glib"
 PKG_SECTION="system"
 PKG_SHORTDESC="irqbalanced: distribute hardware interrupts across processors on a multiprocessor system."
 PKG_LONGDESC="irqbalanced: distribute hardware interrupts across processors on a multiprocessor system."
+PKG_TOOLCHAIN="configure"
 
 pre_configure_target() {
   sh -c ./autogen.sh
diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk
index 2a9944f894..7398679dfe 100644
--- a/packages/tools/bcm2835-bootloader/package.mk
+++ b/packages/tools/bcm2835-bootloader/package.mk
@@ -27,10 +27,7 @@ PKG_DEPENDS_TARGET="toolchain linux"
 PKG_SECTION="tools"
 PKG_SHORTDESC="bcm2835-bootloader: Tool to create a bootable kernel for RaspberryPi"
 PKG_LONGDESC="bcm2835-bootloader: Tool to create a bootable kernel for RaspberryPi"
-
-make_target() {
-  :
-}
+PKG_TOOLCHAIN="manual"
 
 makeinstall_target() {
   mkdir -p $INSTALL/usr/share/bootloader
diff --git a/packages/tools/slice-addon/package.mk b/packages/tools/slice-addon/package.mk
index d5fa71a372..e30c246fdf 100644
--- a/packages/tools/slice-addon/package.mk
+++ b/packages/tools/slice-addon/package.mk
@@ -26,6 +26,7 @@ PKG_URL=""
 PKG_DEPENDS_TARGET=""
 PKG_SHORTDESC="Controls the LED lights on the Slice box using Kodi actions"
 PKG_LONGDESC="Controls the LED lights on the Slice box using Kodi actions"
+PKG_TOOLCHAIN="manual"
 
 make_target() {
 (
diff --git a/projects/Odroid_C2/packages/gcc-linaro-aarch64-elf/package.mk b/projects/Odroid_C2/packages/gcc-linaro-aarch64-elf/package.mk
index 4169b3b13c..6f057b0d44 100644
--- a/projects/Odroid_C2/packages/gcc-linaro-aarch64-elf/package.mk
+++ b/projects/Odroid_C2/packages/gcc-linaro-aarch64-elf/package.mk
@@ -27,10 +27,7 @@ PKG_SOURCE_DIR="gcc-linaro-${PKG_VERSION}-x86_64_aarch64-elf"
 PKG_SECTION="lang"
 PKG_SHORTDESC=""
 PKG_LONGDESC=""
-
-make_host() {
-  :
-}
+PKG_TOOLCHAIN="manual"
 
 makeinstall_host() {
   mkdir -p $TOOLCHAIN/lib/gcc-linaro-aarch64-elf/
diff --git a/projects/Odroid_C2/packages/gcc-linaro-arm-eabi/package.mk b/projects/Odroid_C2/packages/gcc-linaro-arm-eabi/package.mk
index 09b832c4d0..44cb6e04d2 100644
--- a/projects/Odroid_C2/packages/gcc-linaro-arm-eabi/package.mk
+++ b/projects/Odroid_C2/packages/gcc-linaro-arm-eabi/package.mk
@@ -28,10 +28,7 @@ PKG_DEPENDS_HOST="toolchain"
 PKG_SECTION="lang"
 PKG_SHORTDESC=""
 PKG_LONGDESC=""
-
-make_host() {
-  :
-}
+PKG_TOOLCHAIN="manual"
 
 makeinstall_host() {
   mkdir -p $TOOLCHAIN/lib/gcc-linaro-arm-eabi/
diff --git a/scripts/build b/scripts/build
index c11e11bb3b..e2c8ad94ee 100755
--- a/scripts/build
+++ b/scripts/build
@@ -213,7 +213,8 @@ if [ "$PKG_IS_KERNEL_PKG" = "yes" ]; then
   fi
 fi
 
-# build dependencies
+# build dependencies, only when PKG_DEPENDS_? is filled
+unset _pkg_depends
 case "$TARGET" in
   "target") _pkg_depends="$PKG_DEPENDS_TARGET";;
   "host") _pkg_depends="$PKG_DEPENDS_HOST";;
@@ -271,7 +272,7 @@ _auto_toolchain=""
 if [ -z "$PKG_TOOLCHAIN" -o "$PKG_TOOLCHAIN" = "auto" ]; then
   if [ -f "$PKG_MESON_SCRIPT" ]; then
     PKG_TOOLCHAIN="meson"
-  elif [ -f "$PKG_CMAKE_SCRIPT" -a ! "$PKG_USE_CMAKE" = "no" ]; then
+  elif [ -f "$PKG_CMAKE_SCRIPT" ]; then
     PKG_TOOLCHAIN="cmake"
   elif [ -f "$PKG_CONFIGURE_SCRIPT" ]; then
     PKG_TOOLCHAIN="configure"