diff --git a/packages/compress/xz/package.mk b/packages/compress/xz/package.mk index addb44ef0e5..dd9be4c9b73 100644 --- a/packages/compress/xz/package.mk +++ b/packages/compress/xz/package.mk @@ -8,25 +8,10 @@ PKG_SHA256="b92d4e3a438affcf13362a1305cd9d94ed47ddda22e456a42791e630a5644f5c" 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="toolchain" 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="--disable-shared --enable-static \ --enable-symbol-versions=no" - -post_makeinstall_target() { - rm -rf ${INSTALL} -} diff --git a/packages/lang/Python3/package.mk b/packages/lang/Python3/package.mk index ced8d603760..25f04cf91d6 100644 --- a/packages/lang/Python3/package.mk +++ b/packages/lang/Python3/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="9e06008c8901924395bc1da303eac567a729ae012baa182ab39269f650383bb3" PKG_LICENSE="OSS" PKG_SITE="https://www.python.org/" PKG_URL="https://www.python.org/ftp/python/${PKG_VERSION}/${PKG_NAME::-1}-${PKG_VERSION}.tar.xz" -PKG_DEPENDS_HOST="zlib:host bzip2:host libffi:host util-linux:host xz:host autoconf-archive:host" +PKG_DEPENDS_HOST="zlib:host bzip2:host libffi:host util-linux:host autoconf-archive:host" PKG_DEPENDS_TARGET="toolchain Python3:host sqlite expat zlib bzip2 xz openssl libffi readline ncurses util-linux" PKG_LONGDESC="Python3 is an interpreted object-oriented programming language." PKG_TOOLCHAIN="autotools" @@ -29,7 +29,7 @@ PKG_CONFIGURE_OPTS_HOST="ac_cv_prog_HAS_HG=/bin/false --disable-readline --disable-bzip2 --enable-zlib - --enable-xz + --disable-xz --disable-tk --disable-curses --disable-pydoc @@ -116,6 +116,7 @@ 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() { diff --git a/packages/linux/package.mk b/packages/linux/package.mk index b6ed497a916..a93b54ec4f4 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -6,7 +6,7 @@ PKG_NAME="linux" PKG_LICENSE="GPL" PKG_SITE="http://www.kernel.org" PKG_DEPENDS_HOST="ccache:host rsync:host" -PKG_DEPENDS_TARGET="linux:host kmod:host xz:host keyutils openssl:host ${KERNEL_EXTRA_DEPENDS_TARGET}" +PKG_DEPENDS_TARGET="linux:host kmod:host keyutils openssl:host ${KERNEL_EXTRA_DEPENDS_TARGET}" PKG_NEED_UNPACK="${LINUX_DEPENDS} $(get_pkg_directory initramfs) $(get_pkg_variable initramfs PKG_NEED_UNPACK)" PKG_LONGDESC="This package contains a precompiled kernel image and the modules." PKG_IS_KERNEL_PKG="yes" diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.ffmpegdirect/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.ffmpegdirect/package.mk index 20d6cc69b73..463e4dc7a50 100644 --- a/packages/mediacenter/kodi-binary-addons/inputstream.ffmpegdirect/package.mk +++ b/packages/mediacenter/kodi-binary-addons/inputstream.ffmpegdirect/package.mk @@ -9,7 +9,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL2+" PKG_SITE="https://github.com/xbmc/inputstream.ffmpegdirect" PKG_URL="https://github.com/xbmc/inputstream.ffmpegdirect/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain kodi-platform bzip2 ffmpeg gmp libpng libxml2 xz zlib zvbi" +PKG_DEPENDS_TARGET="toolchain kodi-platform bzip2 ffmpeg gmp libpng libxml2 zlib zvbi" PKG_SECTION="" PKG_SHORTDESC="inputstream.ffmpegdirect" PKG_LONGDESC="InputStream Client for streams that can be opened by FFmpeg's libavformat such as plain TS, HLS and DASH (without DRM) streams." diff --git a/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk index 9a20a7e9e0f..bca4d240277 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 158a4827bf6..59579621d2f 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 +} diff --git a/packages/sysutils/squashfs-tools/package.mk b/packages/sysutils/squashfs-tools/package.mk index 4b6e3b867aa..b7ae418c6ca 100644 --- a/packages/sysutils/squashfs-tools/package.mk +++ b/packages/sysutils/squashfs-tools/package.mk @@ -8,15 +8,15 @@ PKG_SHA256="94201754b36121a9f022a190c75f718441df15402df32c2b520ca331a107511c" PKG_LICENSE="GPL" PKG_SITE="https://github.com/plougher/squashfs-tools" PKG_URL="https://github.com/plougher/squashfs-tools/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_HOST="ccache:host zlib:host lzo:host xz:host zstd:host" -PKG_NEED_UNPACK="$(get_pkg_directory zlib) $(get_pkg_directory lzo) $(get_pkg_directory xz) $(get_pkg_directory zstd)" +PKG_DEPENDS_HOST="ccache:host zlib:host lzo:host zstd:host" +PKG_NEED_UNPACK="$(get_pkg_directory zlib) $(get_pkg_directory lzo) $(get_pkg_directory zstd)" PKG_LONGDESC="Tools for squashfs, a highly compressed read-only filesystem for Linux." PKG_TOOLCHAIN="manual" make_host() { make -C squashfs-tools \ mksquashfs \ - XZ_SUPPORT=1 \ + XZ_SUPPORT=0 \ LZO_SUPPORT=1 \ ZSTD_SUPPORT=1 \ XATTR_SUPPORT=0 \ diff --git a/packages/virtual/toolchain/package.mk b/packages/virtual/toolchain/package.mk index a0c205c21bc..5d11cfcc820 100644 --- a/packages/virtual/toolchain/package.mk +++ b/packages/virtual/toolchain/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" PKG_URL="" -PKG_DEPENDS_HOST="7-zip:host autoconf:host autoconf-archive:host automake:host bison:host configtools:host cmake:host flex:host intltool:host libtool:host ninja:host make:host meson:host openssl:host pigz:host sed:host xmlstarlet:host xz:host" +PKG_DEPENDS_HOST="7-zip:host autoconf:host autoconf-archive:host automake:host bison:host configtools:host cmake:host flex:host intltool:host libtool:host ninja:host make:host meson:host openssl:host pigz:host sed:host xmlstarlet:host" PKG_DEPENDS_TARGET="toolchain:host gcc:host patchelf:host pax-utils:host" PKG_SECTION="virtual" PKG_LONGDESC="LibreELEC.tv' toolchain to compile all packages"