From f79dde715b35ebb496a5acb7288165932b4080e4 Mon Sep 17 00:00:00 2001 From: LucĂ­a Andrea Illanes Albornoz Date: Jul 28 2022 12:56:37 +0000 Subject: Revert "groups/{010.host_deps,020.host_deps_rpm}.group: moves file_host as dependency of rpm_host." This reverts commit 723770facca610ddc2acaa472052efa45d2024d3. --- diff --git a/groups/010.host_deps.group b/groups/010.host_deps.group index 7473fd5..7687eb7 100644 --- a/groups/010.host_deps.group +++ b/groups/010.host_deps.group @@ -10,13 +10,13 @@ HOST_DEPS_LDFLAGS_CONFIGURE="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; HOST_DEPS_MAKEFLAGS_INSTALL="prefix= PREFIX="; HOST_DEPS_PACKAGES=" binutils_build bison_host bmake_host bzip2_host ca_certificates_host -chainport_host clang_host clzip_host cmake_host dbus_host expat_host -flex_host gdb_host gdbm_host glib_host gperf_host infounzip_host -infozip_host intltool_host libffi_host libressl_host libz_host -libzip_host llvm_host mdso_host mpackage_host musl_fts_host ncurses_host -ncursestw_host ncursesw_host pcre_host perk_host python2_host python3_host -readline_host ruby_host sbsigntools_host sqlite3_host texinfo_host -tzdb_host util_linux_host xz_host"; +chainport_host clang_host clzip_host cmake_host dbus_host +expat_host file_host flex_host gdb_host gdbm_host glib_host gperf_host +infounzip_host infozip_host intltool_host libffi_host +libressl_host libz_host libzip_host llvm_host mdso_host mpackage_host +musl_fts_host ncurses_host ncursestw_host ncursesw_host pcre_host +perk_host python2_host python3_host readline_host ruby_host sbsigntools_host +sqlite3_host texinfo_host tzdb_host util_linux_host xz_host"; HOST_DEPS_PKG_CONFIG="${PREFIX}/bin/pkgconf"; HOST_DEPS_PREFIX="${PREFIX}"; : ${PKG_BINUTILS_BUILD_DEPENDS:="texinfo_host"}; @@ -99,6 +99,9 @@ HOST_DEPS_PREFIX="${PREFIX}"; : ${PKG_EXPAT_HOST_URL:=http://download.openpkg.org/components/cache/expat/expat-${PKG_EXPAT_HOST_VERSION}.tar.xz}; : ${PKG_EXPAT_HOST_CONFIGURE_ARGS_EXTRA:="--without-docbook"}; : ${PKG_EXPAT_HOST_CONFIGURE_TYPE:="autotools"}; +: ${PKG_FILE_HOST_SHA256SUM:=c076fb4d029c74073f15c43361ef572cfb868407d347190ba834af3b1639b0e4}; +: ${PKG_FILE_HOST_VERSION:=5.42}; +: ${PKG_FILE_HOST_URL:=http://ftp.astron.com/pub/file/file-${PKG_FILE_HOST_VERSION}.tar.gz}; : ${PKG_FLEX_HOST_DEPENDS:="bison_host"}; : ${PKG_FLEX_HOST_SHA256SUM:=e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995}; : ${PKG_FLEX_HOST_VERSION:=2.6.4}; diff --git a/groups/020.host_deps_rpm.group b/groups/020.host_deps_rpm.group index e7eca01..0a1e758 100644 --- a/groups/020.host_deps_rpm.group +++ b/groups/020.host_deps_rpm.group @@ -9,12 +9,9 @@ HOST_DEPS_RPM_GROUP_DEPENDS="host_deps host_tools"; HOST_DEPS_RPM_LDFLAGS_CONFIGURE="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; HOST_DEPS_RPM_MAKEFLAGS_INSTALL_EXTRA="prefix= PREFIX="; HOST_DEPS_RPM_PACKAGES=" -file_host libarchive_host popt_host rpm_host"; +libarchive_host popt_host rpm_host"; HOST_DEPS_RPM_PKG_CONFIG="${PREFIX}/bin/pkgconf"; HOST_DEPS_RPM_PREFIX="${PREFIX}"; -: ${PKG_FILE_HOST_SHA256SUM:=c076fb4d029c74073f15c43361ef572cfb868407d347190ba834af3b1639b0e4}; -: ${PKG_FILE_HOST_VERSION:=5.42}; -: ${PKG_FILE_HOST_URL:=http://ftp.astron.com/pub/file/file-${PKG_FILE_HOST_VERSION}.tar.gz}; : ${PKG_LIBARCHIVE_HOST_SHA256SUM:=f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0}; : ${PKG_LIBARCHIVE_HOST_VERSION:=3.5.2}; : ${PKG_LIBARCHIVE_HOST_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_HOST_VERSION}.tar.xz};