diff options
author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-03-01 21:09:37 +0000 |
---|---|---|
committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-03-01 21:09:37 +0000 |
commit | bf9edfaed49c4387e181be454602e0cc65fe4382 (patch) | |
tree | 2bf582d4f1f0916946bc2285014b193482c52d86 /vars/python2_host.vars | |
parent | 725770754d9f53d5b41d876053a7a993b629472e (diff) | |
download | midipix_build-bf9edfaed49c4387e181be454602e0cc65fe4382.tar.bz2 midipix_build-bf9edfaed49c4387e181be454602e0cc65fe4382.tar.xz |
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.
Diffstat (limited to 'vars/python2_host.vars')
-rw-r--r-- | vars/python2_host.vars | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/vars/python2_host.vars b/vars/python2_host.vars index 2bb62d09..495d0b2f 100644 --- a/vars/python2_host.vars +++ b/vars/python2_host.vars @@ -3,17 +3,19 @@ # pkg_python2_host_fetch_download() { - pkg_fetch_download; - rtl_fileop rm "${PKG_BASE_DIR}/sbpython2"; - rtl_fetch_urls_git "${PKG_BASE_DIR}/build" "sbpython2=${DEFAULT_GITROOT}/python/sbpython2@main"; - rtl_fileop cp ../sbpython2/project/config/cfgdefs.sh ../sbpython2/project/config/cfgdefs.sh.orig; - sed -i"" -e"s/-ltinfo/&w/" -e"s/mb_ncurses_libs='\([^']\+\)'/mb_ncurses_libs='\1 -ltinfow'/" ../sbpython2/project/config/cfgdefs.sh; - sed -i"" -e'108a\ -cfgtest_ldflags_append "-L$mb_prefix/lib"' ../sbpython2/project/config/cfgdefs.sh; - sed -i"" '/^PYCOMPILE_CFLAGS.*+= -std=c99/a\ + if ! pkg_fetch_download\ + || ! rtl_fileop rm "${PKG_BASE_DIR}/sbpython2"\ + || ! rtl_fetch_urls_git "${PKG_BASE_DIR}/build" "sbpython2=${DEFAULT_GITROOT}/python/sbpython2@main"\ + || ! rtl_fileop cp "../sbpython2/project/config/cfgdefs.sh" "../sbpython2/project/config/cfgdefs.sh.orig"\ + || ! sed -i"" -e"s/-ltinfo/&w/" -e"s/mb_ncurses_libs='\([^']\+\)'/mb_ncurses_libs='\1 -ltinfow'/" ../sbpython2/project/config/cfgdefs.sh\ + || ! sed -i"" -e'108a\ +cfgtest_ldflags_append "-L$mb_prefix/lib"' "../sbpython2/project/config/cfgdefs.sh"\ + || ! sed -i"" '/^PYCOMPILE_CFLAGS.*+= -std=c99/a\ PYCOMPILE_CFLAGS += -I'"${PREFIX}"'/include -' ../sbpython2/project/pycompile.mk - ex_pkg_state_set "${PKG_NAME}" fetch_download -fetch_extract; +' "../sbpython2/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 |