From 70fe0dc21adeb09bab3bd25ded1203533dd1e5e8 Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz Date: Feb 14 2020 22:37:53 +0000 Subject: groups/2*.native_packages_*.group: adds dependencies. subr/ex_pkg_dispatch.subr:exp_pkg_dispatch_{group,package}(): correctly register {disabled,skipped} packages in ${_pkgs_found}. --- diff --git a/groups/221.native_packages_dev.group b/groups/221.native_packages_dev.group index 22b3832..0f198eb 100644 --- a/groups/221.native_packages_dev.group +++ b/groups/221.native_packages_dev.group @@ -78,7 +78,7 @@ patchutils perl python2 python3 ruby smallbasic tk"; : ${PKG_PERL_ENV_VARS_EXTRA:="TARGET=${DEFAULT_TARGET}"}; : ${PKG_PERL_MAKEFLAGS_BUILD:=-j1}; : ${PKG_PERL_SUBDIR:=perl-${PKG_PERL_VERSION}}; -: ${PKG_PYTHON2_DEPENDS:="bzip2 curl gdbm libffi libreadline libressl libz ncursesw sqlite3"}; +: ${PKG_PYTHON2_DEPENDS:="bzip2 curl expat gdbm libffi libreadline libressl libz ncursesw sqlite3"}; : ${PKG_PYTHON2_SHA256SUM:=18617d1f15a380a919d517630a9cd85ce17ea602f9bbdc58ddc672df4b0239db}; : ${PKG_PYTHON2_VERSION:=2.7.15}; : ${PKG_PYTHON2_URL:="https://www.python.org/ftp/python/${PKG_PYTHON2_VERSION}/Python-${PKG_PYTHON2_VERSION}.tgz"}; diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index 93039d2..264e389 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -70,7 +70,7 @@ fi; : ${PKG_CLZIP_URL:=http://download.savannah.gnu.org/releases/lzip/clzip/clzip-${PKG_CLZIP_VERSION}.tar.gz}; : ${PKG_CLZIP_CONFIGURE_ARGS:="CC=${DEFAULT_TARGET}-gcc --prefix="}; : ${PKG_CLZIP_IN_TREE:=1}; -: ${PKG_CMAKE_DEPENDS:="curl libarchive libuv ncurses"}; +: ${PKG_CMAKE_DEPENDS:="curl libarchive libuv libz ncurses"}; : ${PKG_CMAKE_SHA256SUM:=dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0}; : ${PKG_CMAKE_VERSION:=3.7.2}; : ${PKG_CMAKE_URL:=https://cmake.org/files/v${PKG_CMAKE_VERSION%.*}/cmake-${PKG_CMAKE_VERSION}.tar.gz}; @@ -100,7 +100,7 @@ fi; : ${PKG_DEBIANUTILS_SUBDIR:=debianutils}; : ${PKG_DEBIANUTILS_BUILD_STEPS_DISABLE:=install_make}; : ${PKG_DEBIANUTILS_INSTALL_FILES:="../obj/run-parts=bin/ ../debianutils/run-parts.8=share/man/man8/"}; -: ${PKG_EMACS_DEPENDS:="freetype libjpeg_turbo gnutls libz"}; +: ${PKG_EMACS_DEPENDS:="freetype gnutls libjpeg_turbo libz ncurses"}; : ${PKG_EMACS_SHA256SUM:=1cf4fc240cd77c25309d15e18593789c8dbfba5c2b44d8f77c886542300fd32c}; : ${PKG_EMACS_VERSION:=26.1}; : ${PKG_EMACS_URL:=http://www.gutscheinrausch.de/mirror/gnu/emacs/emacs-${PKG_EMACS_VERSION}.tar.xz}; diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group index 34ff719..3bb97a4 100644 --- a/groups/241.native_packages_inet.group +++ b/groups/241.native_packages_inet.group @@ -7,7 +7,7 @@ apk_tools aria2 bind dropbear fetchmail git gnupg gnutls httpd inetutils irssi isync ldns lighttpd lynx mailutils microsocks mtr mutt nginx nullmailer openlitespeed opensmtpd openssh pacman rsync socat thttpd w3m weechat wget whois"; -: ${PKG_APK_TOOLS_DEPENDS:="libfetch libressl"}; +: ${PKG_APK_TOOLS_DEPENDS:="libfetch libressl libz"}; : ${PKG_APK_TOOLS_SHA256SUM:=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b}; : ${PKG_APK_TOOLS_VERSION:=2.6.8}; : ${PKG_APK_TOOLS_URL:=http://git.alpinelinux.org/cgit/apk-tools/snapshot/apk-tools-${PKG_APK_TOOLS_VERSION}.tar.bz2}; @@ -18,7 +18,7 @@ w3m weechat wget whois"; : ${PKG_ARIA2_VERSION:=1.32.0}; : ${PKG_ARIA2_URL:=https://github.com/aria2/aria2/releases/download/release-${PKG_ARIA2_VERSION}/aria2-${PKG_ARIA2_VERSION}.tar.xz}; : ${PKG_ARIA2_DISABLED:=1}; -: ${PKG_BIND_DEPENDS:="curl"}; +: ${PKG_BIND_DEPENDS:="curl libressl"}; : ${PKG_BIND_SHA256SUM:=6c044e9ea81add9dbbd2f5dfc224964cc6b6e364e43a8d6d8b574d9282651802}; : ${PKG_BIND_VERSION:=9.13.2}; : ${PKG_BIND_URL:=https://ftp.isc.org/isc/bind/${PKG_BIND_VERSION}/bind-${PKG_BIND_VERSION}.tar.gz}; @@ -34,7 +34,7 @@ w3m weechat wget whois"; : ${PKG_FETCHMAIL_VERSION:=6.4.0.beta4}; : ${PKG_FETCHMAIL_URL:=http://krusty.dt.e-technik.tu-dortmund.de/~ma/fetchmail/fetchmail-${PKG_FETCHMAIL_VERSION}.tar.xz}; : ${PKG_FETCHMAIL_CONFIGURE_ARGS_EXTRA:="--with-kerberos5=no --with-kerberos=no --with-ssl=${PREFIX_NATIVE}"}; -: ${PKG_GIT_DEPENDS:="curl"}; +: ${PKG_GIT_DEPENDS:="curl libz"}; : ${PKG_GIT_SHA256SUM:=690f12cc5691e5adaf2dd390eae6f5acce68ae0d9bd9403814f8a1433833f02a}; : ${PKG_GIT_VERSION:=2.17.1}; : ${PKG_GIT_URL:=https://github.com/git/git/archive/v${PKG_GIT_VERSION}.tar.gz}; diff --git a/groups/261.native_packages_x11.group b/groups/261.native_packages_x11.group index 3b2a3b7..838c3f1 100644 --- a/groups/261.native_packages_x11.group +++ b/groups/261.native_packages_x11.group @@ -193,7 +193,7 @@ xtrans xwd xwin"; : ${PKG_LIBXTST_SHA256SUM:=4655498a1b8e844e3d6f21f3b2c4e2b571effb5fd83199d428a6ba7ea4bf5204}; : ${PKG_LIBXTST_VERSION:=1.2.3}; : ${PKG_LIBXTST_URL:=http://www.x.org/releases/individual/lib/libXtst-${PKG_LIBXTST_VERSION}.tar.bz2}; -: ${PKG_MESA_DEPENDS:="libpthread_stubs libX11 libXext xcb"}; +: ${PKG_MESA_DEPENDS:="expat libpthread_stubs libX11 libXext libz xcb"}; : ${PKG_MESA_SHA256SUM:=694e5c3d37717d23258c1f88bc134223c5d1aac70518d2f9134d6df3ee791eea}; : ${PKG_MESA_VERSION:=18.0.0}; : ${PKG_MESA_URL:=https://mesa.freedesktop.org/archive/mesa-${PKG_MESA_VERSION}.tar.xz}; diff --git a/subr/ex_pkg_dispatch.subr b/subr/ex_pkg_dispatch.subr index e2e7e1b..89396ec 100644 --- a/subr/ex_pkg_dispatch.subr +++ b/subr/ex_pkg_dispatch.subr @@ -40,19 +40,19 @@ exp_pkg_dispatch_group() { exp_pkg_dispatch_package() { local _dispatch_fn="${1}" _group_name="${2}" _pkg_name="${3}" _restart="${4}" _restart_at="${5}" \ - _stderrout_path="${6}" _pipe_path="${7}" _pkg_name_uc="" _rc=0; + _stderrout_path="${6}" _pipe_path="${7}" _pkg_name_uc=""; _pkg_name_uc="$(ex_rtl_toupper "${_pkg_name}")"; if [ -n "$(ex_rtl_get_var_unsafe PKG_${_pkg_name_uc}_DISABLED)" ]; then _pkgs_complete="${_pkgs_complete:+${_pkgs_complete} }${_pkg_name}"; _pkg_names="$(ex_rtl_lfilter "${_pkg_names}" "${_pkg_name}")"; - : $((_pkgs_count+=1)); _rc=1; + : $((_pkgs_count+=1)); "${_dispatch_fn}" disabled_pkg "${_group_name}" "${_pkg_name}" "${_pkgs_count}" "${_pkgs_count_max}"; elif ex_pkg_state_test "${_pkg_name}" finish\ && [ -z "$(ex_rtl_lsearch "${_restart}" "${_pkg_name}")" ]\ && [ "${ARG_RESTART_RECURSIVE:-0}" -ne 2 ]; then _pkgs_complete="${_pkgs_complete:+${_pkgs_complete} }${_pkg_name}"; _pkg_names="$(ex_rtl_lfilter "${_pkg_names}" "${_pkg_name}")"; - : $((_pkgs_count+=1)); _rc=1; + : $((_pkgs_count+=1)); "${_dispatch_fn}" skipped_pkg "${_group_name}" "${_pkg_name}" "${_pkgs_count}" "${_pkgs_count_max}"; else : $((_pkgs_count+=1)); _pkgs_wait="${_pkgs_wait:+${_pkgs_wait} }${_pkg_name}"; @@ -64,7 +64,6 @@ exp_pkg_dispatch_package() { "${_dispatch_fn}";) 1>"${_stderrout_path}" 2>&1 3>"${_pipe_path}" & : $((_njobs+=1)); fi; - return "${_rc}"; }; exp_pkg_expand_packages() {