diff --git a/packages/addons/addon-depends/chrome-depends/icu/package.mk b/packages/addons/addon-depends/chrome-depends/icu/package.mk index e428a3f269..d4ccf8c3a1 100644 --- a/packages/addons/addon-depends/chrome-depends/icu/package.mk +++ b/packages/addons/addon-depends/chrome-depends/icu/package.mk @@ -26,7 +26,7 @@ configure_package() { PKG_CONFIGURE_OPTS_TARGET="--with-cross-build=$PKG_BUILD/.$HOST_NAME \ $PKG_ICU_OPTS" - PKG_CONFIGURE_SCRIPT="source/configure" + PKG_CONFIGURE_SCRIPT="${PKG_BUILD}/source/configure" } post_makeinstall_target() { diff --git a/packages/devel/gettext/package.mk b/packages/devel/gettext/package.mk index 766147a191..48d131cb7d 100644 --- a/packages/devel/gettext/package.mk +++ b/packages/devel/gettext/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="gettext" PKG_VERSION="0.19.8.1" @@ -10,14 +11,16 @@ PKG_URL="http://ftp.gnu.org/pub/gnu/gettext/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS_HOST="ccache:host" PKG_LONGDESC="A program internationalization library and tools." -PKG_CONFIGURE_SCRIPT="gettext-tools/configure" +configure_package() { + PKG_CONFIGURE_SCRIPT="${PKG_BUILD}/gettext-tools/configure" -PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared \ - --disable-rpath \ - --with-gnu-ld \ - --disable-java \ - --disable-curses \ - --with-included-libxml \ - --disable-native-java \ - --disable-csharp \ - --without-emacs" + PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared \ + --disable-rpath \ + --with-gnu-ld \ + --disable-java \ + --disable-curses \ + --with-included-libxml \ + --disable-native-java \ + --disable-csharp \ + --without-emacs" +} diff --git a/packages/linux-drivers/dvbhdhomerun/package.mk b/packages/linux-drivers/dvbhdhomerun/package.mk index b71ef80bbf..948c48e140 100644 --- a/packages/linux-drivers/dvbhdhomerun/package.mk +++ b/packages/linux-drivers/dvbhdhomerun/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="dvbhdhomerun" PKG_VERSION="20130704" @@ -13,7 +14,20 @@ PKG_NEED_UNPACK="$LINUX_DEPENDS" PKG_LONGDESC="A linux DVB driver for the HDHomeRun TV tuner (http://www.silicondust.com)." PKG_IS_KERNEL_PKG="yes" -PKG_CMAKE_SCRIPT="userhdhomerun/CMakeLists.txt" +configure_package() { + PKG_CMAKE_SCRIPT="${PKG_BUILD}/userhdhomerun/CMakeLists.txt" +} + +pre_configure_target() { + # use it here to be sure libhdhomerun is already built + PKG_CMAKE_OPTS_TARGET="-DLIBHDHOMERUN_PATH=$(ls -d $BUILD/libhdhomerun-*/)" + + # absolute path + LIBHDHOMERUN_PATH=$(ls -d $BUILD/libhdhomerun-*/) + sed -i "s|SET(LIBHDHOMERUN_PATH .*)|SET(LIBHDHOMERUN_PATH $LIBHDHOMERUN_PATH)|g" ../userhdhomerun/CMakeLists.txt + sed -i "s|/etc/dvbhdhomerun|/tmp/dvbhdhomerun|g" ../userhdhomerun/hdhomerun_tuner.cpp + sed -i "s|/etc/dvbhdhomerun|/tmp/dvbhdhomerun|g" ../userhdhomerun/hdhomerun_controller.cpp +} pre_make_target() { ( cd ../kernel @@ -22,18 +36,6 @@ pre_make_target() { ) } -pre_configure_target() { - -# use it here to be sure libhdhomerun is already built - PKG_CMAKE_OPTS_TARGET="-DLIBHDHOMERUN_PATH=$(ls -d $BUILD/libhdhomerun-*/)" - -# absolute path - LIBHDHOMERUN_PATH=$(ls -d $BUILD/libhdhomerun-*/) - sed -i "s|SET(LIBHDHOMERUN_PATH .*)|SET(LIBHDHOMERUN_PATH $LIBHDHOMERUN_PATH)|g" ../userhdhomerun/CMakeLists.txt - sed -i "s|/etc/dvbhdhomerun|/tmp/dvbhdhomerun|g" ../userhdhomerun/hdhomerun_tuner.cpp - sed -i "s|/etc/dvbhdhomerun|/tmp/dvbhdhomerun|g" ../userhdhomerun/hdhomerun_controller.cpp -} - makeinstall_target() { cd $PKG_BUILD mkdir -p $INSTALL/$(get_full_module_dir)/hdhomerun