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/perl.vars | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) (limited to 'vars/perl.vars') diff --git a/vars/perl.vars b/vars/perl.vars index 6a42a4ef..b9708ec1 100644 --- a/vars/perl.vars +++ b/vars/perl.vars @@ -3,22 +3,33 @@ # pkg_perl_fetch_extract_post() { - local _fname_src="" _fname_dst="" _cflag=""; - (rtl_fileop cd "${PKG_BASE_DIR}"; - for _fname_src in $(find perl-cross -type f \ - -not -path perl-cross/.git/\* -not -name .gitignore); do - _fname_dst="perl-${PKG_VERSION}${_fname_src#perl-cross}"; - if [ -f "${_fname_dst}" ]; then - rtl_fileop mv "${_fname_dst}" "${_fname_dst}.orig"; - fi; - if [ ! -d "$(rtl_dirname "${_fname_dst}")" ]; then - rtl_fileop mkdir "$(rtl_dirname "${_fname_dst}")"; - fi; - rtl_fileop cp "${_fname_src}" "${_fname_dst}"; - done); - for _cflag in ${PKG_CFLAGS_CONFIGURE}; do - PKG_CONFIGURE_ARGS="${PKG_CONFIGURE_ARGS:+${PKG_CONFIGURE_ARGS} }-A ccflags=${_cflag}"; - done; + local _cflag="" _fname_dst="" _fname_src=""; + if ! ( if ! rtl_fileop cd "${PKG_BASE_DIR}"; then + return 1; + else + for _fname_src in $(find perl-cross -type f -not -path perl-cross/.git/\* -not -name .gitignore); do + _fname_dst="perl-${PKG_VERSION}${_fname_src#perl-cross}"; + if [ -f "${_fname_dst}" ]; then + if ! rtl_fileop mv "${_fname_dst}" "${_fname_dst}.orig"; then + return 1; + fi; + fi; + if [ ! -d "$(rtl_dirname "${_fname_dst}")" ]; then + if ! rtl_fileop mkdir "$(rtl_dirname "${_fname_dst}")"; then + return 1; + fi; + fi; + if ! rtl_fileop cp "${_fname_src}" "${_fname_dst}"; then + return 1; + fi; + done; + fi); then + return 1; + else + for _cflag in ${PKG_CFLAGS_CONFIGURE}; do + PKG_CONFIGURE_ARGS="$(rtl_lconcat "${PKG_CONFIGURE_ARGS}" "-A ccflags=${_cflag}")"; + done; + fi; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 -- cgit v1.2.3