diff --git a/packages/compress/xz/package.mk b/packages/compress/xz/package.mk index dc61cb4c32..5b9a0cb22f 100644 --- a/packages/compress/xz/package.mk +++ b/packages/compress/xz/package.mk @@ -8,22 +8,11 @@ PKG_SHA256="0b54f79df85912504de0b14aec7971e3f964491af1812d83447005807513cd9e" PKG_LICENSE="GPL" PKG_SITE="https://tukaani.org/xz/" PKG_URL="https://github.com/tukaani-project/xz/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz" -PKG_DEPENDS_HOST="ccache:host" PKG_DEPENDS_TARGET="autotools:host gcc:host" PKG_LONGDESC="A free general-purpose data compression software with high compression ratio." -PKG_BUILD_FLAGS="+pic +pic:host" +PKG_BUILD_FLAGS="+pic -sysroot" PKG_TOOLCHAIN="configure" -# never build shared or k0p happens when building -# on fedora due to host selinux/liblzma -PKG_CONFIGURE_OPTS_HOST="--disable-shared --enable-static \ - --disable-lzmadec \ - --disable-lzmainfo \ - --enable-lzma-links \ - --disable-nls \ - --disable-scripts \ - --enable-symbol-versions=no" - PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --disable-shared \ --disable-doc \ diff --git a/packages/lang/Python3/package.mk b/packages/lang/Python3/package.mk index 36c6c99321..6675aff0f7 100644 --- a/packages/lang/Python3/package.mk +++ b/packages/lang/Python3/package.mk @@ -114,6 +114,13 @@ post_make_target() { sed -e "s,\([\'|\ ]\)/usr/lib,\1${SYSROOT_PREFIX}/usr/lib,g" -i ${PKG_SYSCONFIG_FILE} } +pre_configure_target() { + export PYTHON_MODULES_INCLUDE="${TARGET_INCDIR}" + export PYTHON_MODULES_LIB="${TARGET_LIBDIR}" + export DISABLED_EXTENSIONS="${PKG_PY_DISABLED_MODULES}" + export PKG_CONFIG_PATH="$(get_install_dir xz)/usr/lib/pkgconfig:${PKG_CONFIG_PATH}" +} + post_makeinstall_target() { ln -sf ${PKG_PYTHON_VERSION} ${INSTALL}/usr/bin/python diff --git a/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk index 3b862010f3..13764cd4d8 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk @@ -17,3 +17,9 @@ PKG_LONGDESC="pvr.iptvsimple" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" + +pre_configure_target() { + ls -la ../Findlzma.cmake + sed -i -e "s#^find_path(LZMA_INCLUDE_DIRS lzma.h#find_path(LZMA_INCLUDE_DIRS lzma.h PATHS $(get_install_dir xz)/usr/include NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH#" \ + -e "s#^find_library(LZMA_LIBRARIES NAMES lzma liblzma#find_library(LZMA_LIBRARIES NAMES lzma liblzma PATHS $(get_install_dir xz)/usr/lib NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH#" ../Findlzma.cmake +} diff --git a/packages/mediacenter/kodi-binary-addons/vfs.libarchive/package.mk b/packages/mediacenter/kodi-binary-addons/vfs.libarchive/package.mk index 31b262b7ba..180869039e 100644 --- a/packages/mediacenter/kodi-binary-addons/vfs.libarchive/package.mk +++ b/packages/mediacenter/kodi-binary-addons/vfs.libarchive/package.mk @@ -16,3 +16,9 @@ PKG_LONGDESC="vfs.libarchive" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.vfs" + +pre_configure_target() { + export LibLZMA_ROOT="$(get_install_dir xz)/usr" + sed -i -e 's/^cmake_minimum_required(VERSION 3.5)/cmake_minimum_required(VERSION 3.12)/' \ + -e 's/^find_package(LibLZMA REQUIRED)/set(CMAKE_FIND_OLD_ROOT_PATH ${CMAKE_FIND_ROOT_PATH})\nset(CMAKE_FIND_ROOT_PATH "")\nfind_package(LibLZMA REQUIRED)\nset(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_OLD_ROOT_PATH})/' ../CMakeLists.txt +}