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/apr.vars | 11 +- vars/bash.vars | 2 +- vars/binutils.vars | 7 +- vars/bison.vars | 2 +- vars/busybox.vars | 12 ++- vars/ca_certificates.vars | 12 ++- vars/chainport_host.vars | 8 +- vars/check_updates.vars | 241 ------------------------------------------- vars/clang_host.vars | 38 +++---- vars/cmake.vars | 82 ++++++++------- vars/dbus_host.vars | 2 +- vars/emacs.vars | 2 +- vars/gcc.vars | 2 +- vars/gdb.vars | 7 +- vars/gdk.vars | 7 +- vars/ghostscript.vars | 12 ++- vars/git.vars | 12 ++- vars/glib.vars | 17 +-- vars/gnutls.vars | 6 +- vars/htop.vars | 6 +- vars/install_strip_host.vars | 17 +-- vars/jamvm.vars | 9 -- vars/libasr.vars | 9 -- vars/libevent.vars | 2 +- vars/libfirm.vars | 9 +- vars/libgcrypt.vars | 6 +- vars/libgpg_error.vars | 9 -- vars/libjpeg_turbo.vars | 35 ++++--- vars/libksba.vars | 6 +- vars/libnettle.vars | 6 +- vars/libpcap.vars | 2 +- vars/libressl_host.vars | 2 +- vars/libsolv.vars | 65 ++++++------ vars/libtool_host.vars | 2 +- vars/libxml2.vars | 16 +-- vars/libzip.vars | 79 +++++++------- vars/lighttpd.vars | 2 +- vars/llvm_host.vars | 40 +++---- vars/lolcode.vars | 25 +++-- vars/lua.vars | 9 -- vars/make.vars | 6 +- vars/mc.vars | 2 +- vars/mlogin.vars | 9 -- vars/mpackage_host.vars | 8 +- vars/musl.vars | 2 +- vars/mutt.vars | 2 +- vars/nano.vars | 30 +++--- vars/nasm_host.vars | 7 +- vars/nginx.vars | 4 +- vars/nullmailer.vars | 13 +-- vars/openbsd_baseutils.vars | 10 +- vars/openjpeg.vars | 53 +++++----- vars/perl.vars | 45 +++++--- vars/pkgconf_host.vars | 20 ++-- vars/procps_ng.vars | 2 +- vars/psxstub_host.vars | 16 +-- vars/python2.vars | 12 ++- vars/python2_host.vars | 24 +++-- vars/python3.vars | 12 ++- vars/python3_host.vars | 24 +++-- vars/rc.vars | 6 +- vars/rpm_host.vars | 10 +- vars/ruby.vars | 7 +- vars/sdl1.vars | 4 +- vars/smallbasic.vars | 2 +- vars/tcl.vars | 2 +- vars/tdnf.vars | 9 -- vars/texinfo.vars | 24 +++-- vars/texinfo_host.vars | 12 ++- vars/tzdb_host.vars | 2 +- vars/util_linux.vars | 2 +- vars/vim.vars | 10 +- vars/w3m.vars | 2 +- vars/xcb.vars | 2 +- vars/yabasic.vars | 2 +- vars/zsh.vars | 2 +- 76 files changed, 516 insertions(+), 721 deletions(-) delete mode 100644 vars/check_updates.vars delete mode 100644 vars/jamvm.vars delete mode 100644 vars/libasr.vars delete mode 100644 vars/libgpg_error.vars delete mode 100644 vars/lua.vars delete mode 100644 vars/mlogin.vars delete mode 100644 vars/tdnf.vars (limited to 'vars') diff --git a/vars/apr.vars b/vars/apr.vars index cbc192a5..4ed7cbbd 100644 --- a/vars/apr.vars +++ b/vars/apr.vars @@ -11,11 +11,14 @@ apr_cv_process_shared_works=no apr_cv_tcp_nodelay_with_cork=no"}; pkg_apr_install_make_post() { - sed -e 's,echo "\$APR_BUILD_DIR/libtool",echo '"${PKG_DESTDIR}"'/bin/slibtool,' \ + if ! sed \ + -e 's,echo "\$APR_BUILD_DIR/libtool",echo '"${PKG_DESTDIR}"'/bin/slibtool,' \ -e 's,echo "\${installbuilddir}/libtool",echo '"${PKG_DESTDIR}"'/bin/slibtool,' \ -e 's,flags="\$flags -I\$includedir \$EXTRA_INCLUDES",flags="-I'"${PKG_PREFIX}"'/include/apr-1",' \ - "${PKG_DESTDIR}/bin/apr-1-config" > "${PKG_DESTDIR}/bin/${PKG_TARGET}-apr-1-config"; - chmod +x "${PKG_DESTDIR}/bin/${PKG_TARGET}-apr-1-config"; + "${PKG_DESTDIR}/bin/apr-1-config" > "${PKG_DESTDIR}/bin/${PKG_TARGET}-apr-1-config" \ + || ! rtl_fileop chmod +x "${PKG_DESTDIR}/bin/${PKG_TARGET}-apr-1-config"; then + return 1; + fi; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/bash.vars b/vars/bash.vars index 2a61c1ce..10bc6eab 100644 --- a/vars/bash.vars +++ b/vars/bash.vars @@ -12,4 +12,4 @@ bash_cv_ulimit_maxfds=yes bash_cv_under_sys_siglist=yes bash_cv_unusable_rtsigs=no"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/binutils.vars b/vars/binutils.vars index c7727319..bc5e4b3b 100644 --- a/vars/binutils.vars +++ b/vars/binutils.vars @@ -4,8 +4,9 @@ pkg_binutils_configure_patch_post() { local _overlay_dname="${BUILD_WORKDIR}/chainport/overlay/m${PKG_NAME%%_*}"; - if [ -d "${_overlay_dname}" ]; then - tar -C "${_overlay_dname}" -cpf - . | tar -C "${PKG_BASE_DIR}/${PKG_SUBDIR}" -xpf -; + if [ -d "${_overlay_dname}" ]\ + && ! tar -C "${_overlay_dname}" -cpf - . | tar -C "${PKG_BASE_DIR}/${PKG_SUBDIR}" -xpf -; then + return 1; fi; }; @@ -21,4 +22,4 @@ pkg_binutils_mingw32_configure_patch_post() { pkg_binutils_configure_patch_post "${@}"; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/bison.vars b/vars/bison.vars index 0f29a896..4e0d43b5 100644 --- a/vars/bison.vars +++ b/vars/bison.vars @@ -6,4 +6,4 @@ ac_cv_path_M4=/bin/m4 ac_cv_prog_gnu_m4_gnu=yes"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/busybox.vars b/vars/busybox.vars index 14b33b91..7fb88cdd 100644 --- a/vars/busybox.vars +++ b/vars/busybox.vars @@ -7,10 +7,12 @@ pkg_busybox_configure() { }; pkg_busybox_install_make_post() { - set +o noglob - rtl_fileop cp "${PKG_BUILD_DIR}/_install/bin/"* "${PKG_DESTDIR}/bin/"; - set -o noglob - rtl_fileop cp "${PKG_BUILD_DIR}/_install/lib/libbusybox.so.${PKG_VERSION}" "${PKG_DESTDIR}/lib/"; + set +o noglob; + if ! rtl_fileop cp "${PKG_BUILD_DIR}/_install/bin/"* "${PKG_DESTDIR}/bin/"\ + || ! rtl_fileop cp "${PKG_BUILD_DIR}/_install/lib/libbusybox.so.${PKG_VERSION}" "${PKG_DESTDIR}/lib/"; then + set -o noglob; return 1; + fi; + set -o noglob; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/ca_certificates.vars b/vars/ca_certificates.vars index 69d7bfb7..9a162dfe 100644 --- a/vars/ca_certificates.vars +++ b/vars/ca_certificates.vars @@ -3,14 +3,16 @@ # pkg_ca_certificates_install_make_pre() { - ${PKG_DESTDIR}/../ca-certificates/certdata2pem_host + "${PKG_DESTDIR}/../ca-certificates/certdata2pem_host"; }; pkg_ca_certificates_install_make_post() { - rtl_fileop cd "${PKG_DESTDIR}/share/ca-certificates"; set +o noglob - find . -name '*.crt' | sort | cut -b3- > ${PKG_DESTDIR}/etc/ca-certificates.conf - set -o noglob + if ! rtl_fileop cd "${PKG_DESTDIR}/share/ca-certificates"\ + || ! find . -name '*.crt' | sort | cut -b3- > ${PKG_DESTDIR}/etc/ca-certificates.conf; then + set -o noglob; return 1; + fi; + set -o noglob; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/chainport_host.vars b/vars/chainport_host.vars index aa4450f4..a4108eb4 100644 --- a/vars/chainport_host.vars +++ b/vars/chainport_host.vars @@ -3,8 +3,10 @@ # pkg_chainport_host_install_make() { - rtl_fileop rm "${BUILD_WORKDIR}/chainport"; - rtl_fileop cp ../chainport "${BUILD_WORKDIR}/chainport"; + if ! rtl_fileop rm "${BUILD_WORKDIR}/chainport"\ + || ! rtl_fileop cp ../chainport "${BUILD_WORKDIR}/chainport"; then + return 1; + fi; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/check_updates.vars b/vars/check_updates.vars deleted file mode 100644 index e563dac6..00000000 --- a/vars/check_updates.vars +++ /dev/null @@ -1,241 +0,0 @@ -# -# set +o errexit -o noglob is assumed. -# - -pkg_apk_tools_check_updates() { - case "${1}" in - get_fnames) - cu_fname="${cu_url##*/}"; - cu_fname_base="apk-tools"; - cu_fname_ext="${cu_fname#${cu_fname_base}-${cu_version}.}"; - cu_url_index="http://git.alpinelinux.org/cgit/apk-tools/"; - cu_fnames="$(wget ${DEFAULT_WGET_ARGS} -qO- "${cu_url_index}" |\ - sed -n '//s/^.*The current version is 1.0.6<\/b>/s/^.*

The current version is \(.\+\)<\/b>.*$/bzip2-\1/p')"; - ;; - get_version) - cu_fname_version="${cu_fname#bzip2-}"; - ;; - esac; -}; - -pkg_infounzip_check_updates() { - case "${1}" in - get_fnames) - cu_fname="${cu_url##*/}"; - cu_fname_base="${cu_fname%%[0-9]*}"; - cu_fname_ext="${cu_fname#${cu_fname_base}${cu_version}.}"; - cu_url_index="${cu_url%/*}/"; - cu_fnames="$(wget ${DEFAULT_WGET_ARGS} -qO- "${cu_url_index}" |\ - sed -n '/[hH][rR][eE][fF]="[^"]\+"/s/^.*[hH][rR][eE][fF]="\([^"]\+\)".*$/\1/p' |\ - grep -Ev '/(zip232|unzip552)\..+$')"; - ;; - get_version) - if [ "${cu_fname#${cu_fname_base}}" != "${cu_fname}" ]\ - && [ "${cu_fname%.${cu_fname_ext}}" != "${cu_fname}" ]; then - cu_fname_version="${cu_fname%.${cu_fname_ext}}"; - cu_fname_version="${cu_fname_version#*zip*}"; - fi; - ;; - esac; -}; - -pkg_infozip_check_updates() { - pkg_infounzip_check_updates "${@}"; -}; - -pkg_john_check_updates() { - case "${1}" in - get_fnames) - cu_url_index="${cu_url%/*}/"; - cu_fnames="$(wget ${DEFAULT_WGET_ARGS} -qO- "${cu_url_index}" |\ - sed -n '/[hH][rR][eE][fF]="[^"]\+"/s/^.*[hH][rR][eE][fF]="\([^"]\+\)".*$/\1/p' |\ - grep -Ev 'john-.+-jumbo-.+\.')"; - ;; - esac; -}; - -pkg_less_check_updates() { - case "${1}" in - get_fnames) - cu_url_index="http://www.greenwoodsoftware.com/less/"; - cu_fnames="$(wget ${DEFAULT_WGET_ARGS} -qO- "${cu_url_index}" |\ - sed -n '/The current released version is less-[0-9]\+/s/^.*The current released version is less-\([0-9]\+\).*$/less-\1/p')"; - ;; - get_version) - cu_fname_version="${cu_fname#less-}"; - ;; - esac; -}; - -pkg_libgpg_error_check_updates() { - case "${1}" in - get_fnames) - cu_url_index="${cu_url%/*}/"; - cu_fnames="$(wget ${DEFAULT_WGET_ARGS} -qO- "${cu_url_index}" |\ - sed -n '/href="[^"]\+"/s/^.*href="\([^"]\+\)".*$/\1/p')"; - cu_fname_base="libgpg-error"; - ;; - esac; -}; - -pkg_lynx_check_updates() { - case "${1}" in - get_fnames) - cu_fname="${cu_url##*/}"; - cu_fname_base="lynx"; - cu_fname_ext="${cu_fname#${cu_fname_base}${cu_version}.}"; - ;; - get_version) - if [ "${cu_fname#${cu_fname_base}-cur}" = "${cu_fname}" ]\ - && [ "${cu_fname#*rel\.}" != "${cu_fname}" ]\ - && [ "${cu_fname#${cu_fname_base}}" != "${cu_fname}" ]\ - && [ "${cu_fname%.${cu_fname_ext}}" != "${cu_fname}" ]; then - cu_fname_version="${cu_fname%.${cu_fname_ext}}"; - cu_fname_version="${cu_fname_version#lynx}"; - fi; - ;; - esac; -}; - -pkg_libpthread_stubs_check_updates() { - case "${1}" in - get_fnames) - cu_fname_base="libpthread-stubs"; - ;; - esac; -}; - -pkg_man_db_check_updates() { - case "${1}" in - get_fnames) - cu_fname="${cu_url##*/}"; - cu_fname_base="man-db"; - cu_fname_ext="${cu_fname#${cu_fname_base}-${cu_version}.}"; - ;; - esac; -}; - -pkg_mksh_check_updates() { - case "${1}" in - get_version) - if [ "${cu_fname#${cu_fname_base}-}" != "${cu_fname}" ]\ - && [ "${cu_fname%.${cu_fname_ext}}" != "${cu_fname}" ]; then - cu_fname_version="${cu_fname%.${cu_fname_ext}}"; - cu_fname_version="${cu_fname_version#*-R}"; - fi; - ;; - version_fixup) - cu_version="${cu_version#R}"; - ;; - esac; -}; - -pkg_pacman_check_updates() { - case "${1}" in - get_fnames) - cu_fname="${cu_url##*/}"; - cu_fname_base="pacman"; - cu_fname_ext="${cu_fname#${cu_fname_base}-${cu_version}.}"; - cu_url_index="https://git.archlinux.org/pacman.git/"; - cu_fnames="$(wget ${DEFAULT_WGET_ARGS} -qO- "${cu_url_index}" |\ - sed -n '//s/^.* "${PREFIX}/bin/${PKG_TARGET}-install-strip" < "${PREFIX}/bin/${PKG_TARGET}-install-strip" < "${PKG_DESTDIR}/bin/${PKG_TARGET}-xml2-config" < "${PKG_DESTDIR}/bin/${PKG_TARGET}-xml2-config" < "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config" < "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config" < "${PKG_DESTDIR}/lib/rpm/elfdeps"; - chmod +x "${PKG_DESTDIR}/lib/rpm/elfdeps"; - rtl_fileop rm "${PKG_DESTDIR}/var"; + if ! echo "#!/bin/true" > "${PKG_DESTDIR}/lib/rpm/elfdeps"\ + || ! rtl_fileop chmod +x "${PKG_DESTDIR}/lib/rpm/elfdeps"\ + || ! rtl_fileop rm "${PKG_DESTDIR}/var"; then + return 1; + fi; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/ruby.vars b/vars/ruby.vars index 00273c1e..acb8757f 100644 --- a/vars/ruby.vars +++ b/vars/ruby.vars @@ -3,9 +3,8 @@ # pkg_ruby_install_make_pre() { - if [ ! -e rbconfig.rb.orig ]; then - sed -i.orig '/^\s*CONFIG\["prefix"\]\s*=.*$/s/=.*$/= ""/' \ - rbconfig.rb; + if ! [ -e "rbconfig.rb.orig" ]; then + sed -i.orig '/^\s*CONFIG\["prefix"\]\s*=.*$/s/=.*$/= ""/' "rbconfig.rb"; fi; }; @@ -13,4 +12,4 @@ pkg_ruby_host_install_make_pre() { pkg_ruby_install_make_pre; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/sdl1.vars b/vars/sdl1.vars index 11cb139e..f39019a0 100644 --- a/vars/sdl1.vars +++ b/vars/sdl1.vars @@ -3,7 +3,7 @@ # pkg_sdl1_configure_autotools_pre() { - ${PKG_BASE_DIR}/${PKG_SUBDIR}/autogen.sh; + "${PKG_BASE_DIR}/${PKG_SUBDIR}/autogen.sh"; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/smallbasic.vars b/vars/smallbasic.vars index f15da5bc..21cf67d4 100644 --- a/vars/smallbasic.vars +++ b/vars/smallbasic.vars @@ -6,4 +6,4 @@ ac_cv_path_PCRECONFIG=%PREFIX%/bin/pcre-config ac_cv_prog_have_pcre=%PREFIX%/bin/pcre-config"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/tcl.vars b/vars/tcl.vars index 921d447a..ca6f9610 100644 --- a/vars/tcl.vars +++ b/vars/tcl.vars @@ -6,4 +6,4 @@ tcl_cv_strtod_buggy=false tcl_cv_strtod_unbroken=true"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/tdnf.vars b/vars/tdnf.vars deleted file mode 100644 index 60936bb4..00000000 --- a/vars/tdnf.vars +++ /dev/null @@ -1,9 +0,0 @@ -# -# set +o errexit -o noglob is assumed. -# - -pkg_tdnf_configure_autotools_pre() { - autoreconf -iv; -}; - -# vim:filetype=sh diff --git a/vars/texinfo.vars b/vars/texinfo.vars index 3a7a3d07..7e9aaa64 100644 --- a/vars/texinfo.vars +++ b/vars/texinfo.vars @@ -3,17 +3,19 @@ # pkg_texinfo_build_pre() { - rtl_run_cmd_unsplit make \ - ${PKG_MAKEFLAGS_BUILD} \ - ${PKG_MAKEFLAGS_BUILD_EXTRA} \ - "LIBTOOL=${PKG_LIBTOOL:-slibtool}" \ - -C tools; - rtl_run_cmd_unsplit make \ - ${PKG_MAKEFLAGS_BUILD} \ - ${PKG_MAKEFLAGS_BUILD_EXTRA} \ - "LIBTOOL=${PKG_LIBTOOL:-slibtool}" \ - LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib" LIBS="-ltinfo" \ - -C tools/info; + if ! rtl_run_cmd_unsplit make \ + ${PKG_MAKEFLAGS_BUILD} \ + ${PKG_MAKEFLAGS_BUILD_EXTRA} \ + "LIBTOOL=${PKG_LIBTOOL:-slibtool}" \ + -C tools \ + || ! rtl_run_cmd_unsplit make \ + ${PKG_MAKEFLAGS_BUILD} \ + ${PKG_MAKEFLAGS_BUILD_EXTRA} \ + "LIBTOOL=${PKG_LIBTOOL:-slibtool}" \ + LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib" LIBS="-ltinfo" \ + -C "tools/info"; then + return 1; + fi; }; # vim:filetype=sh textwidth=0 diff --git a/vars/texinfo_host.vars b/vars/texinfo_host.vars index 2a441f28..def754c0 100644 --- a/vars/texinfo_host.vars +++ b/vars/texinfo_host.vars @@ -4,14 +4,20 @@ pkg_texinfo_host_install_make_post() { if [ -e "${PKG_DESTDIR}/bin/makeinfo" ]; then - rtl_fileop mv "${PKG_DESTDIR}/bin/makeinfo" "${PKG_DESTDIR}/bin/makeinfo.dist"; + if ! rtl_fileop mv "${PKG_DESTDIR}/bin/makeinfo" "${PKG_DESTDIR}/bin/makeinfo.dist"; then + return 1; + fi; fi; - cat > "${PKG_DESTDIR}/bin/makeinfo" < "${PKG_DESTDIR}/bin/makeinfo" <