From bf9edfaed49c4387e181be454602e0cc65fe4382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Sun, 1 Mar 2020 21:09:37 +0000 Subject: General cleanup, pt. III. dist/dist_digest.dist: removes obsolete dist file. etc/{build.usage,README.md}: updated. groups/000.host_tools.group:{autoconf,automake,gettext_tiny,install_strip,libtool,m4}_host: moved from groups/010.host_deps.group. groups/221.native_packages_dev.group:lua: moved from groups/231.native_packages_etc.group. groups/221.native_packages_dev.group:lua:${PKG_FORCE_AUTORECONF}: set. groups/231.native_packages_etc.group:{mlogin,tdnf}:${PKG_FORCE_AUTORECONF}: set. groups/241.native_packages_inet.group:nullmailer:${PKG_FORCE_AUTORECONF}: set. groups/251.native_packages_lib.group:lib{asr,gpg_error}:${PKG_FORCE_AUTORECONF}: set. midipix.env, etc/README.md, subr/pkg_configure_autotools.subr: adds FORCE_NO_AUTORECONF. subr/rtl_fileop.subr: adds ch{mod,own} fileops. vars/{check_updates,jamvm,lib{asr,gpg_error},lua,mlogin,tdnf}.vars: removes obsolete vars file. --- vars/python3_host.vars | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'vars/python3_host.vars') diff --git a/vars/python3_host.vars b/vars/python3_host.vars index 020724e1..55ec443a 100644 --- a/vars/python3_host.vars +++ b/vars/python3_host.vars @@ -3,17 +3,19 @@ # pkg_python3_host_fetch_download() { - pkg_fetch_download; - rtl_fileop rm "${PKG_BASE_DIR}/sbpython3"; - rtl_fetch_urls_git "${PKG_BASE_DIR}/build" "sbpython3=${DEFAULT_GITROOT}/python/sbpython3@main"; - rtl_fileop cp ../sbpython3/project/config/cfgdefs.sh ../sbpython3/project/config/cfgdefs.sh.orig; - sed -i"" -e"s/-ltinfo/&w/" -e"s/mb_ncurses_libs='\([^']\+\)'/mb_ncurses_libs='\1 -ltinfow'/" ../sbpython3/project/config/cfgdefs.sh; - sed -i"" -e'108a\ -cfgtest_ldflags_append "-L$mb_prefix/lib"' ../sbpython3/project/config/cfgdefs.sh; - sed -i"" '/^PYCOMPILE_CFLAGS.*+= -std=c99/a\ + if ! pkg_fetch_download\ + || ! rtl_fileop rm "${PKG_BASE_DIR}/sbpython3"\ + || ! rtl_fetch_urls_git "${PKG_BASE_DIR}/build" "sbpython3=${DEFAULT_GITROOT}/python/sbpython3@main"\ + || ! rtl_fileop cp "../sbpython3/project/config/cfgdefs.sh" "../sbpython3/project/config/cfgdefs.sh.orig"\ + || ! sed -i"" -e"s/-ltinfo/&w/" -e"s/mb_ncurses_libs='\([^']\+\)'/mb_ncurses_libs='\1 -ltinfow'/" "../sbpython3/project/config/cfgdefs.sh"\ + || ! sed -i"" -e'108a\ +cfgtest_ldflags_append "-L$mb_prefix/lib"' "../sbpython3/project/config/cfgdefs.sh"\ + || ! sed -i"" '/^PYCOMPILE_CFLAGS.*+= -std=c99/a\ PYCOMPILE_CFLAGS += -I'"${PREFIX}"'/include -' ../sbpython3/project/pycompile.mk - ex_pkg_state_set "${PKG_NAME}" fetch_download -fetch_extract; +' "../sbpython3/project/pycompile.mk"\ + || ! ex_pkg_state_set "${PKG_NAME}" "fetch_download" "-fetch_extract"; then + return 1; + fi; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 -- cgit v1.2.3