From 5d749446342f708d732e8f1350dbbd6c75fedd75 Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz (arab, vxp) Date: Apr 30 2018 10:37:57 +0000 Subject: vars/build.vars:native_packages_deps: build xz prior to libsolv. --- diff --git a/vars/build.vars b/vars/build.vars index 6e1ea95..bfa6e6b 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -347,7 +347,7 @@ expat libxml2 alsa_lib apr apr_util bzip2 libdmtx libressl curl libz lmdb libpng libjpeg_turbo tiff giflib libffi gdbm geoip pcre glib gzip libarchive libatomic_ops musl_compat libbsd libpipeline libevent libfetch libogg libvorbis libgpg_error libassuan libfirm libgcrypt libksba libudns lua ncurses ncursestw ncursesw libnettle gnutls libreadline npth -popt file rpm libsolv tdnf shared_mime_info sqlite3 w32api w32lib xz cmake qrencode util_linux"; +popt file rpm xz libsolv tdnf shared_mime_info sqlite3 w32api w32lib cmake qrencode util_linux"; NATIVE_PACKAGES_DEPS_PREFIX="${PREFIX_NATIVE}"; NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python"; : ${PKG_EXPAT_SHA256SUM:=d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff}; @@ -526,6 +526,9 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python"; : ${PKG_RPM_VERSION:=4.14.1}; : ${PKG_RPM_URL:=http://ftp.rpm.org/releases/rpm-${PKG_RPM_VERSION%.*}.x/rpm-${PKG_RPM_VERSION}.tar.bz2}; : ${PKG_RPM_CONFIGURE_ARGS_EXTRA:="--with-lua --enable-ndb --enable-lmdb --enable-bdb=no --with-crypto=openssl --with-vendor=midipix"}; +: ${PKG_XZ_SHA256SUM:=73df4d5d34f0468bd57d09f2d8af363e95ed6cc3a4a86129d2f2c366259902a2}; +: ${PKG_XZ_VERSION:=5.2.2}; +: ${PKG_XZ_URL:=https://github.com/xz-mirror/xz/releases/download/v${PKG_XZ_VERSION}/xz-${PKG_XZ_VERSION}.tar.gz}; : ${PKG_LIBSOLV_SHA256SUM:=153eb48814ffdbac396c98126037cf45c07e2b7087a61f86eb18a75ea1ab134b}; : ${PKG_LIBSOLV_VERSION:=0.6.34}; : ${PKG_LIBSOLV_URL:=https://github.com/openSUSE/libsolv/archive/${PKG_LIBSOLV_VERSION}.tar.gz}; @@ -549,9 +552,6 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python"; : ${PKG_W32API_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_NATIVE}"}; : ${PKG_W32LIB_URLS_GIT:="w32lib=git://git.midipix.org/w32lib"}; : ${PKG_W32LIB_CONFIGURE_ARGS:="--host=${DEFAULT_TARGET} --prefix= --target=${DEFAULT_TARGET}"}; -: ${PKG_XZ_SHA256SUM:=73df4d5d34f0468bd57d09f2d8af363e95ed6cc3a4a86129d2f2c366259902a2}; -: ${PKG_XZ_VERSION:=5.2.2}; -: ${PKG_XZ_URL:=https://github.com/xz-mirror/xz/releases/download/v${PKG_XZ_VERSION}/xz-${PKG_XZ_VERSION}.tar.gz}; : ${PKG_CMAKE_SHA256SUM:=7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe}; : ${PKG_CMAKE_VERSION:=3.6.3}; : ${PKG_CMAKE_URL:=https://cmake.org/files/v${PKG_CMAKE_VERSION%.*}/cmake-${PKG_CMAKE_VERSION}.tar.gz};