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 | |
| 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')
76 files changed, 516 insertions, 721 deletions
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 '/<a href='\''\/cgit\/apk-tools\/tag\/?h=v[0-9.]\+'\''>/s/^.*<a href='\''\/cgit\/apk-tools\/tag\/?h=v\([0-9.]\+\).*$/apk-tools-\1/p')"; - ;; - get_version) - cu_fname_version="${cu_fname#apk-tools-}"; - ;; - esac; -}; - -pkg_bzip2_check_updates() { - case "${1}" in - get_fnames) - cu_url_index="http://www.bzip.org/"; - cu_fnames="$(wget ${DEFAULT_WGET_ARGS} -qO- "${cu_url_index}" |\ - sed -n '/<p>The current version is <b>1.0.6<\/b>/s/^.*<p>The current version is <b>\(.\+\)<\/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 '/<a href='\''\/pacman.git\/tag\/?h=v[0-9.]\+'\''>/s/^.*<a href='\''\/pacman.git\/tag\/?h=v\([0-9.]\+\).*$/pacman-\1/p')"; - ;; - get_version) - cu_fname_version="${cu_fname#pacman-}"; - ;; - esac; -}; - -pkg_procps_ng_check_updates() { - case "${1}" in - get_fnames) - cu_url_index="https://gitlab.com/procps-ng/procps/tags/"; - cu_fnames="$(wget ${DEFAULT_WGET_ARGS} -qO- "${cu_url_index}" |\ - sed -n '/<a href="\/procps-ng\/procps\/tags\/[^"]\+"/s/^.*<a href="\/procps-ng\/procps\/tags\/v\([^"]\+\)".*$/\1/p')"; - ;; - get_version) - cu_fname_version="${cu_fname}"; - ;; - esac; -}; - -pkg_rxvt_unicode_check_updates() { - case "${1}" in - get_fnames) - cu_fname_base="rxvt-unicode"; - ;; - esac; -}; - -pkg_the_silver_searcher_check_updates() { - case "${1}" in - get_fnames) - cu_url_index="http://geoff.greer.fm/ag/"; - cu_fnames="$(wget ${DEFAULT_WGET_ARGS} -qO- ${cu_url_index} |\ - sed -n '/href="[^"]\+"/{s/^.*href="\([^"]\+\)".*$/\1/;s/\/$//;p}')"; - ;; - esac; -}; - -pkg_tmux_check_updates() { - case "${1}" in - get_fnames) - cu_url_index="https://github.com/tmux/tmux/releases/"; - cu_fnames="$(wget ${DEFAULT_WGET_ARGS} -qO- "${cu_url_index}" |\ - sed -n '/<a href="\/tmux\/tmux\/releases\/tag\//s/^.*<a href="\/tmux\/tmux\/releases\/tag\/\(.\+\)".*$/\1/p')"; - ;; - esac; -}; - - -pkg_util_linux_check_updates() { - case "${1}" in - get_fnames) - cu_fname_base="util-linux"; - cu_url_index="https://www.kernel.org/pub/linux/utils/util-linux/"; - cu_fnames="$(wget ${DEFAULT_WGET_ARGS} -qO- ${cu_url_index} |\ - sed -n '/href="[^"]\+"/{s/^.*href="\([^"]\+\)".*$/\1/;s/\/$//;p}')"; - ;; - 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#v}"; - fi; - ;; - esac; -}; - -pkg_xcb_proto_check_updates() { - case "${1}" in - get_fnames) - cu_fname_base="xcb-proto"; - ;; - esac; -}; - -pkg_zsh_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 -v -- "-doc")"; - ;; - esac; -}; - -# vim:filetype=sh diff --git a/vars/clang_host.vars b/vars/clang_host.vars index ada3ba33..b7ec7e97 100644 --- a/vars/clang_host.vars +++ b/vars/clang_host.vars @@ -3,23 +3,25 @@ # pkg_clang_host_configure() { - rtl_fileop rm "../cfe-${PKG_VERSION}-host"; - rtl_fileop mkdir "../cfe-${PKG_VERSION}-host"; - rtl_fileop cd "../cfe-${PKG_VERSION}-host"; - rtl_log_msg info "Bootstrapping clang_host..."; - ("${PREFIX}/bin/cmake" \ - "../cfe-${PKG_VERSION}.src" \ - -DCLANG_BUILD_EXAMPLES:BOOL=OFF \ - -DCLANG_INCLUDE_DOCS:BOOL=OFF \ - -DCLANG_INCLUDE_TESTS:BOOL=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX="" \ - -DCMAKE_VERBOSE_MAKEFILE=NO \ - -DLIBCLANG_BUILD_STATIC:BOOL=ON \ - -DLLVM_PREFIX="${PKG_PREFIX}" \ - -G "Unix Makefiles" \ - -Wno-dev); - rtl_log_msg info "Finished bootstrapping clang_host."; + if ! rtl_fileop rm "../cfe-${PKG_VERSION}-host" \ + || ! rtl_fileop mkdir "../cfe-${PKG_VERSION}-host" \ + || ! rtl_fileop cd "../cfe-${PKG_VERSION}-host" \ + || ! rtl_log_msg info "Bootstrapping clang_host..." \ + || ! ("${PREFIX}/bin/cmake" \ + "../cfe-${PKG_VERSION}.src" \ + -DCLANG_BUILD_EXAMPLES:BOOL=OFF \ + -DCLANG_INCLUDE_DOCS:BOOL=OFF \ + -DCLANG_INCLUDE_TESTS:BOOL=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX="" \ + -DCMAKE_VERBOSE_MAKEFILE=NO \ + -DLIBCLANG_BUILD_STATIC:BOOL=ON \ + -DLLVM_PREFIX="${PKG_PREFIX}" \ + -G "Unix Makefiles" \ + -Wno-dev) \ + || ! rtl_log_msg info "Finished bootstrapping clang_host."; then + return 1; + fi; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/cmake.vars b/vars/cmake.vars index 4417026c..4a830a6e 100644 --- a/vars/cmake.vars +++ b/vars/cmake.vars @@ -3,42 +3,43 @@ # pkg_cmake_configure() { - rtl_fileop cp "${PREFIX}/share/cmake-${PKG_VERSION%.*}/Modules/Platform/BSDOS.cmake" \ - "${PREFIX}/share/cmake-${PKG_VERSION%.*}/Modules/Platform/Midipix.cmake"; - rm -f config.cache; - env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" \ - PREFIX="" \ - cmake -DBZIP2_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DBZIP2_LIBRARIES="${PKG_PREFIX}/lib/libbz2.a" \ - -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ - -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ - -DCMAKE_CXX_COMPILER="${PREFIX}/bin/${PKG_TARGET}-g++" \ - -DCMAKE_INSTALL_PREFIX= \ - -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \ - -DCMAKE_SYSTEM_NAME=Midipix \ - -DCMAKE_USE_SYSTEM_BZIP2=ON \ - -DCMAKE_USE_SYSTEM_CURL=ON \ - -DCMAKE_USE_SYSTEM_EXPAT=OFF \ - -DCMAKE_USE_SYSTEM_LIBUV=ON \ - -DCMAKE_USE_SYSTEM_LIBARCHIVE=ON \ - -DCMAKE_USE_SYSTEM_ZLIB=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DCURL_INCLUDE_DIR="${PKG_PREFIX}/include/curl" \ - -DCURL_LIBRARY="${PKG_PREFIX}/lib/libcurl.lib.a" \ - -DCURSES_NCURSES_LIBRARY="${PKG_PREFIX}/lib/libncurses.lib.a" \ - -DKWSYS_LFS_WORKS=YES \ - -DLibUV_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DLibUV_LIBRARY="${PKG_PREFIX}/lib/libuv.1.0.0.lib.a" \ - -DLibArchive_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DLibArchive_LIBRARY="${PKG_PREFIX}/lib/libarchive.lib.a" \ - -DLIBLZMA_HAS_AUTO_DECODER=YES \ - -DLIBLZMA_HAS_EASY_ENCODER=YES \ - -DLIBLZMA_HAS_LZMA_PRESET=YES \ - -DLIBLZMA_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DLIBLZMA_LIBRARY="${PKG_PREFIX}/lib/liblzma.lib.a" \ - -DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.a" \ - "../cmake-${PKG_VERSION}"; + if ! rtl_fileop cp "${PREFIX}/share/cmake-${PKG_VERSION%.*}/Modules/Platform/BSDOS.cmake" \ + "${PREFIX}/share/cmake-${PKG_VERSION%.*}/Modules/Platform/Midipix.cmake" \ + || ! rtl_fileop rm config.cache \ + || ! env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" PREFIX="" \ + || ! cmake -DBZIP2_INCLUDE_DIR="${PKG_PREFIX}/include" \ + -DBZIP2_LIBRARIES="${PKG_PREFIX}/lib/libbz2.a" \ + -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ + -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ + -DCMAKE_CXX_COMPILER="${PREFIX}/bin/${PKG_TARGET}-g++" \ + -DCMAKE_INSTALL_PREFIX= \ + -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \ + -DCMAKE_SYSTEM_NAME=Midipix \ + -DCMAKE_USE_SYSTEM_BZIP2=ON \ + -DCMAKE_USE_SYSTEM_CURL=ON \ + -DCMAKE_USE_SYSTEM_EXPAT=OFF \ + -DCMAKE_USE_SYSTEM_LIBARCHIVE=ON \ + -DCMAKE_USE_SYSTEM_LIBUV=ON \ + -DCMAKE_USE_SYSTEM_ZLIB=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCURL_INCLUDE_DIR="${PKG_PREFIX}/include/curl" \ + -DCURL_LIBRARY="${PKG_PREFIX}/lib/libcurl.lib.a" \ + -DCURSES_NCURSES_LIBRARY="${PKG_PREFIX}/lib/libncurses.lib.a" \ + -DKWSYS_LFS_WORKS=YES \ + -DLibArchive_INCLUDE_DIR="${PKG_PREFIX}/include" \ + -DLibArchive_LIBRARY="${PKG_PREFIX}/lib/libarchive.lib.a" \ + -DLIBLZMA_HAS_AUTO_DECODER=YES \ + -DLIBLZMA_HAS_EASY_ENCODER=YES \ + -DLIBLZMA_HAS_LZMA_PRESET=YES \ + -DLIBLZMA_INCLUDE_DIR="${PKG_PREFIX}/include" \ + -DLIBLZMA_LIBRARY="${PKG_PREFIX}/lib/liblzma.lib.a" \ + -DLibUV_INCLUDE_DIR="${PKG_PREFIX}/include" \ + -DLibUV_LIBRARY="${PKG_PREFIX}/lib/libuv.1.0.0.lib.a" \ + -DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include" \ + -DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.a" \ + "../cmake-${PKG_VERSION}"; then + return 1; + fi; }; pkg_cmake_install_make_pre() { @@ -49,13 +50,14 @@ pkg_cmake_install_make_pre() { }; pkg_cmake_host_configure() { - rm -f config.cache; - cmake -DCURSES_NCURSES_LIBRARY="${PKG_PREFIX}/lib/libncurses.so" \ - "../cmake-${PKG_VERSION}"; + if ! rtl_fileop rm config.cache \ + || ! cmake -DCURSES_NCURSES_LIBRARY="${PKG_PREFIX}/lib/libncurses.so" "../cmake-${PKG_VERSION}"; then + return 1; + fi; }; pkg_cmake_host_install_make_pre() { pkg_cmake_install_make_pre; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/dbus_host.vars b/vars/dbus_host.vars index 65b6d7eb..899133ea 100644 --- a/vars/dbus_host.vars +++ b/vars/dbus_host.vars @@ -6,4 +6,4 @@ pkg_dbus_host_install_pre() { rtl_fileop rm "${PKG_DESTDIR}/etc" "${PKG_DESTDIR}/var"; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/emacs.vars b/vars/emacs.vars index 79fdd2f7..06d4d9b5 100644 --- a/vars/emacs.vars +++ b/vars/emacs.vars @@ -10,4 +10,4 @@ gl_cv_func_readlink_works=yes gl_cv_func_working_mktime=yes gl_cv_func_working_utimes=yes"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/gcc.vars b/vars/gcc.vars index ec22fe62..bf2ab44f 100644 --- a/vars/gcc.vars +++ b/vars/gcc.vars @@ -335,4 +335,4 @@ pkg_gcc_full_all() { fi; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/gdb.vars b/vars/gdb.vars index 595db375..1c8e5326 100644 --- a/vars/gdb.vars +++ b/vars/gdb.vars @@ -4,8 +4,9 @@ pkg_gdb_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; }; @@ -17,4 +18,4 @@ pkg_gdb_minipix_configure_patch_post() { pkg_gdb_configure_patch_post "${@}"; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/gdk.vars b/vars/gdk.vars index f29e48f3..0aac8f8a 100644 --- a/vars/gdk.vars +++ b/vars/gdk.vars @@ -8,9 +8,10 @@ enable_gio_sniffing=yes"}; pkg_gdk_install_files_post() { local _pc_path=""; for _pc_path in $(find "${PKG_DESTDIR}"/lib/pkgconfig -name \*.pc); do - sed -i"" -e '/^Requires:\s\+gobject-2.0$/s/^.*$/& gio-2.0/' \ - "${_pc_path}"; + if ! sed -i"" -e '/^Requires:\s\+gobject-2.0$/s/^.*$/& gio-2.0/' "${_pc_path}"; then + return 1; + fi; done; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/ghostscript.vars b/vars/ghostscript.vars index ee6ec5e2..e3fef154 100644 --- a/vars/ghostscript.vars +++ b/vars/ghostscript.vars @@ -3,10 +3,12 @@ # pkg_ghostscript_configure_patch_pre() { - rtl_fileop rm "${PKG_BASE_DIR}/ghostscript-9.26/zlib"; - rtl_fileop rm "${PKG_BASE_DIR}/ghostscript-9.26/libpng"; - rtl_fileop rm "${PKG_PREFIX}/freetype"; - rtl_fileop rm "${PKG_PREFIX}/lcms2mt"; + if ! rtl_fileop rm "${PKG_BASE_DIR}/ghostscript-9.26/libpng" \ + || ! rtl_fileop rm "${PKG_BASE_DIR}/ghostscript-9.26/zlib" \ + || ! rtl_fileop rm "${PKG_PREFIX}/freetype" \ + || ! rtl_fileop rm "${PKG_PREFIX}/lcms2mt"; then + return 1; + fi; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/git.vars b/vars/git.vars index d872c7e8..89ef2121 100644 --- a/vars/git.vars +++ b/vars/git.vars @@ -7,11 +7,13 @@ ac_cv_fread_reads_directories=1 ac_cv_snprintf_returns_bogus=0"}; pkg_git_install_make_post() { - local __="" _new=""; - for __ in $(find "${PKG_DESTDIR}" -name "Git*::*" -type f); do - _new="$(echo ${__} | sed "s/::/./g")"; - rtl_fileop mv "${__}" "${_new}"; + local _fname="" _fname_new=""; + for _fname in $(find "${PKG_DESTDIR}" -name "Git*::*" -type f); do + _fname_new="$(echo ${_fname} | sed "s/::/./g")"; + if ! rtl_fileop mv "${_fname}" "${_fname_new}"; then + return 1; + fi; done; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/glib.vars b/vars/glib.vars index 77bcc894..55d97500 100644 --- a/vars/glib.vars +++ b/vars/glib.vars @@ -3,18 +3,19 @@ # : ${PKG_GLIB_CONFIG_CACHE_EXTRA:=" -glib_cv_stack_grows=yes -glib_cv_uscore=yes -ac_cv_func_posix_getpwuid_r=yes ac_cv_func_posix_getgrgid_r=yes -glib_cv_eventfd=no"}; -: ${PKG_GLIB_HOST_CONFIG_CACHE_EXTRA:=${PKG_GLIB_CONFIG_CACHE_EXTRA}}; +ac_cv_func_posix_getpwuid_r=yes +glib_cv_eventfd=no +glib_cv_stack_grows=yes +glib_cv_uscore=yes"}; +: ${PKG_GLIB_HOST_CONFIG_CACHE_EXTRA:="${PKG_GLIB_CONFIG_CACHE_EXTRA}"}; pkg_glib_install_files_post() { local _pc_path=""; for _pc_path in $(find "${PKG_DESTDIR}"/lib/pkgconfig -name \*.pc); do - sed -i"" -e '/^Libs:/s/^\(Libs:\s\+-L\${libdir}\)\s\+\(.\+\)$/\1 \2 -lffi -lpcre -lz/' \ - "${_pc_path}"; + if ! sed -i"" -e '/^Libs:/s/^\(Libs:\s\+-L\${libdir}\)\s\+\(.\+\)$/\1 \2 -lffi -lpcre -lz/' "${_pc_path}"; then + return 1; + fi; done; }; @@ -22,4 +23,4 @@ pkg_glib_host_install_files_post() { pkg_glib_install_files_post; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/gnutls.vars b/vars/gnutls.vars index 556ac215..651d17f5 100644 --- a/vars/gnutls.vars +++ b/vars/gnutls.vars @@ -3,7 +3,7 @@ # : ${PKG_GNUTLS_CONFIG_CACHE_EXTRA:=" -gl_cv_ld_output_def=no -gl_cv_func_working_getdelim=yes"}; +gl_cv_func_working_getdelim=yes +gl_cv_ld_output_def=no"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/htop.vars b/vars/htop.vars index 910d7140..bb4d0829 100644 --- a/vars/htop.vars +++ b/vars/htop.vars @@ -3,7 +3,7 @@ # : ${PKG_HTOP_CONFIG_CACHE_EXTRA:=" -ac_cv_lib_ncursesw6_addnwstr=yes -ac_cv_lib_ncursesw_addnwstr=yes"}; +ac_cv_lib_ncursesw_addnwstr=yes +ac_cv_lib_ncursesw6_addnwstr=yes"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/install_strip_host.vars b/vars/install_strip_host.vars index 1a60be72..624cb749 100644 --- a/vars/install_strip_host.vars +++ b/vars/install_strip_host.vars @@ -3,15 +3,20 @@ # pkg_install_strip_host_all() { - if [ -e "${PREFIX}/bin/${PKG_TARGET}-install-strip" ]; then - rtl_fileop rm "${PREFIX}/bin/${PKG_TARGET}-install-strip"; + if [ -e "${PREFIX}/bin/${PKG_TARGET}-install-strip" ]\ + && ! rtl_fileop rm "${PREFIX}/bin/${PKG_TARGET}-install-strip"; then + return 1; fi; - rtl_fileop mkdir "${PREFIX}/bin"; - cat > "${PREFIX}/bin/${PKG_TARGET}-install-strip" <<EOF + if ! rtl_fileop mkdir "${PREFIX}/bin" \ + || ! cat > "${PREFIX}/bin/${PKG_TARGET}-install-strip" <<EOF #!/bin/sh install -s "\${@}"; EOF - chmod +x "${PREFIX}/bin/${PKG_TARGET}-install-strip"; + then + return 1; + elif ! rtl_fileop chmod +x "${PREFIX}/bin/${PKG_TARGET}-install-strip"; then + return 1; + fi; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/jamvm.vars b/vars/jamvm.vars deleted file mode 100644 index fbefd30b..00000000 --- a/vars/jamvm.vars +++ /dev/null @@ -1,9 +0,0 @@ -# -# set +o errexit -o noglob is assumed. -# - -pkg_jamvm_configure_autotools_pre() { - autoreconf -iv; -}; - -# vim:filetype=sh diff --git a/vars/libasr.vars b/vars/libasr.vars deleted file mode 100644 index 67737232..00000000 --- a/vars/libasr.vars +++ /dev/null @@ -1,9 +0,0 @@ -# -# set +o errexit -o noglob is assumed. -# - -pkg_libasr_configure_autotools_pre() { - autoreconf -iv; -}; - -# vim:filetype=sh diff --git a/vars/libevent.vars b/vars/libevent.vars index cda3a3cd..bfefd791 100644 --- a/vars/libevent.vars +++ b/vars/libevent.vars @@ -5,4 +5,4 @@ : ${PKG_LIBEVENT_CONFIG_CACHE_EXTRA:=" ac_pe_target=true"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/libfirm.vars b/vars/libfirm.vars index 74008878..2ec01b98 100644 --- a/vars/libfirm.vars +++ b/vars/libfirm.vars @@ -3,16 +3,15 @@ # pkg_cparser_configure_pre() { - export CFLAGS_PATH="-I${PKG_DESTDIR}/include"; - export LDFLAGS_PATH="-L${PKG_DESTDIR}/lib"; + export CFLAGS_PATH="-I${PKG_DESTDIR}/include" LDFLAGS_PATH="-L${PKG_DESTDIR}/lib"; }; -pkg_libfirm_install_make() { +pkg_cparser_install_make() { make ${PKG_MAKEFLAGS_BUILD} DESTDIR="${PKG_DESTDIR}" install; }; -pkg_cparser_install_make() { +pkg_libfirm_install_make() { make ${PKG_MAKEFLAGS_BUILD} DESTDIR="${PKG_DESTDIR}" install; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/libgcrypt.vars b/vars/libgcrypt.vars index 53a34f6e..a7f08444 100644 --- a/vars/libgcrypt.vars +++ b/vars/libgcrypt.vars @@ -3,7 +3,7 @@ # : ${PKG_LIBGCRYPT_CONFIG_CACHE_EXTRA:=" -gcry_cv_visibility_attribute=yes -gcry_cv_broken_visibility_attribute=no"}; +gcry_cv_broken_visibility_attribute=no +gcry_cv_visibility_attribute=yes"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/libgpg_error.vars b/vars/libgpg_error.vars deleted file mode 100644 index 588f2c05..00000000 --- a/vars/libgpg_error.vars +++ /dev/null @@ -1,9 +0,0 @@ -# -# set +o errexit -o noglob is assumed. -# - -pkg_libgpg_error_configure_autotools_pre() { - autoreconf -ivf; -}; - -# vim:filetype=sh diff --git a/vars/libjpeg_turbo.vars b/vars/libjpeg_turbo.vars index 8ede8063..a8f1a8d5 100644 --- a/vars/libjpeg_turbo.vars +++ b/vars/libjpeg_turbo.vars @@ -3,19 +3,22 @@ # pkg_libjpeg_turbo_configure() { - rm -f config.cache; - env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" \ - PREFIX="" \ - cmake -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \ - -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ - -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ - -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ - -DCMAKE_BUILD_TYPE="Debug" \ - -DCMAKE_INSTALL_PREFIX= \ - -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \ - -DWITH_JPEG8=ON \ - -DCMAKE_ASM_NASM_COMPILER="${PREFIX}/bin/${PKG_TARGET}-nasm" \ - -DCMAKE_ASM_NASM_OBJECT_FORMAT="win64" \ - -DWITH_SIMD=OFF \ - "../libjpeg-turbo-${PKG_VERSION}"; -} + if ! rtl_fileop rm config.cache \ + || ! env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" PREFIX="" \ + cmake -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ + -DCMAKE_ASM_NASM_COMPILER="${PREFIX}/bin/${PKG_TARGET}-nasm" \ + -DCMAKE_ASM_NASM_OBJECT_FORMAT="win64" \ + -DCMAKE_BUILD_TYPE="Debug" \ + -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ + -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="ONLY" \ + -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="NEVER" \ + -DCMAKE_INSTALL_PREFIX="" \ + -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \ + -DWITH_JPEG8="ON" \ + -DWITH_SIMD="OFF" \ + "../libjpeg-turbo-${PKG_VERSION}"; then + return 1; + fi; +}; + +# vim:filetype=sh textwidth=0 diff --git a/vars/libksba.vars b/vars/libksba.vars index 64f491a1..1560e097 100644 --- a/vars/libksba.vars +++ b/vars/libksba.vars @@ -3,7 +3,7 @@ # : ${PKG_LIBKSBA_CONFIG_CACHE_EXTRA:=" -ksba_cv_visibility_attribute=yes -ksba_cv_broken_visibility_attribute=no"}; +ksba_cv_broken_visibility_attribute=no +ksba_cv_visibility_attribute=yes"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/libnettle.vars b/vars/libnettle.vars index 3d6b96ed..863da683 100644 --- a/vars/libnettle.vars +++ b/vars/libnettle.vars @@ -4,8 +4,10 @@ pkg_libnettle_install_make_post() { set +o noglob; - chmod +x ${PKG_DESTDIR}/lib/lib*.so*; + if ! rtl_fileop chmod +x "${PKG_DESTDIR}/lib/"lib*.so*; then + set -o noglob; return 1; + fi; set -o noglob; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/libpcap.vars b/vars/libpcap.vars index bf7416c1..2fada3bd 100644 --- a/vars/libpcap.vars +++ b/vars/libpcap.vars @@ -5,4 +5,4 @@ : ${PKG_LIBPCAP_CONFIG_CACHE_EXTRA:=" ac_cv_lbl_unaligned_fail=no"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/libressl_host.vars b/vars/libressl_host.vars index 033aa5ab..3a216f06 100644 --- a/vars/libressl_host.vars +++ b/vars/libressl_host.vars @@ -6,4 +6,4 @@ pkg_libressl_host_install_pre() { rtl_fileop rm "${PKG_DESTDIR}/etc"; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/libsolv.vars b/vars/libsolv.vars index e3be2cbc..494b0ade 100644 --- a/vars/libsolv.vars +++ b/vars/libsolv.vars @@ -3,37 +3,38 @@ # pkg_libsolv_configure() { - rm -f config.cache; - env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" \ - PREFIX="" \ - cmake -DCMAKE_FIND_ROOT_PATH="${PKG_PREFIX}" \ - -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \ - -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \ - -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ - -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ - -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ - -DCMAKE_CXX_COMPILER="${PREFIX}/bin/${PKG_TARGET}-g++" \ - -DCMAKE_INSTALL_PREFIX= \ - -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \ - -DFEDORA=1 \ - -DWITH_LIBXML2:BOOL=ON \ - -DENABLE_COMPLEX_DEPS:BOOL=ON \ - -DENABLE_RPMDB_BYRPMHEADER:BOOL=ON \ - -DENABLE_RPMDB_LIBRPM:BOOL=ON \ - -DENABLE_RPMPKG_LIBRPM:BOOL=ON \ - -DENABLE_LZMA_COMPRESSION:BOOL=ON \ - -DENABLE_BZIP2_COMPRESSION:BOOL=ON \ - -DENABLE_COMPS:BOOL=ON \ - -DENABLE_APPDATA:BOOL=ON \ - -DENABLE_RPMDB:BOOL=ON \ - -DENABLE_RPMMD:BOOL=ON \ - -DLIBXML2_LIBRARIES="${PKG_PREFIX}/lib/libxml2.lib.a" \ - -DBZIP2_LIBRARIES="${PKG_PREFIX}/lib/libbz2.lib.a" \ - -DLZMA_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DLZMA_LIBRARY="${PKG_PREFIX}/lib/liblzma.lib.a" \ - -DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.a" \ - "../libsolv-${PKG_VERSION}"; + if ! rtl_fileop rm config.cache \ + || ! env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" PREFIX="" \ + cmake -DBZIP2_LIBRARIES="${PKG_PREFIX}/lib/libbz2.lib.a" \ + -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ + -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ + -DCMAKE_CXX_COMPILER="${PREFIX}/bin/${PKG_TARGET}-g++" \ + -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="ONLY" \ + -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY="ONLY" \ + -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="NEVER" \ + -DCMAKE_FIND_ROOT_PATH="${PKG_PREFIX}" \ + -DCMAKE_INSTALL_PREFIX="" \ + -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \ + -DENABLE_APPDATA:BOOL="ON" \ + -DENABLE_BZIP2_COMPRESSION:BOOL="ON" \ + -DENABLE_COMPLEX_DEPS:BOOL="ON" \ + -DENABLE_COMPS:BOOL="ON" \ + -DENABLE_LZMA_COMPRESSION:BOOL="ON" \ + -DENABLE_RPMDB:BOOL="ON" \ + -DENABLE_RPMDB_BYRPMHEADER:BOOL="ON" \ + -DENABLE_RPMDB_LIBRPM:BOOL="ON" \ + -DENABLE_RPMMD:BOOL="ON" \ + -DENABLE_RPMPKG_LIBRPM:BOOL="ON" \ + -DFEDORA="1" \ + -DLIBXML2_LIBRARIES="${PKG_PREFIX}/lib/libxml2.lib.a" \ + -DLZMA_INCLUDE_DIR="${PKG_PREFIX}/include" \ + -DLZMA_LIBRARY="${PKG_PREFIX}/lib/liblzma.lib.a" \ + -DWITH_LIBXML2:BOOL="ON" \ + -DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include" \ + -DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.a" \ + "../libsolv-${PKG_VERSION}"; then + return 1; + fi; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/libtool_host.vars b/vars/libtool_host.vars index 2c37c031..4e35a82c 100644 --- a/vars/libtool_host.vars +++ b/vars/libtool_host.vars @@ -23,4 +23,4 @@ pkg_libtool_host_build() { "${PKG_PKG_CONFIG_PATH:+PKG_CONFIG_PATH=${PKG_PKG_CONFIG_PATH}}"; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/libxml2.vars b/vars/libxml2.vars index 99fecd56..a30c3c1a 100644 --- a/vars/libxml2.vars +++ b/vars/libxml2.vars @@ -3,18 +3,22 @@ # pkg_libxml2_install_make_post() { - if [ -e "${PKG_DESTDIR}/bin/${PKG_TARGET}-xml2-config" ]; then - rtl_fileop rm "${PKG_DESTDIR}/bin/${PKG_TARGET}-xml2-config"; + if [ -e "${PKG_DESTDIR}/bin/${PKG_TARGET}-xml2-config" ]\ + && ! rtl_fileop rm "${PKG_DESTDIR}/bin/${PKG_TARGET}-xml2-config"; then + return 1; fi; - cat > "${PKG_DESTDIR}/bin/${PKG_TARGET}-xml2-config" <<EOF + if ! cat > "${PKG_DESTDIR}/bin/${PKG_TARGET}-xml2-config" <<EOF #!/bin/sh case "\${1}" in --cflags) echo "-I${PREFIX_NATIVE}/include/libxml2"; ;; --libs) echo "-L${PREFIX_NATIVE}/lib" -lxml2 -lz -llzma -lpthread -lm; ;; esac; EOF - chmod +x "${PKG_DESTDIR}/bin/${PKG_TARGET}-xml2-config"; - + then + return 1; + else + rtl_fileop chmod +x "${PKG_DESTDIR}/bin/${PKG_TARGET}-xml2-config"; + fi; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/libzip.vars b/vars/libzip.vars index 43478f95..57b85798 100644 --- a/vars/libzip.vars +++ b/vars/libzip.vars @@ -9,33 +9,34 @@ pkg_libzip_configure() { release) _build_type="Release"; ;; *) exit 1; ;; esac; - rm -f config.cache; - env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" \ - PREFIX="" LDFLAGS="-lbz2" \ - cmake -DBZIP2_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DBZIP2_LIBRARIES="${PKG_PREFIX}/lib/libbz2.lib.a" \ - -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ - -DCMAKE_BUILD_TYPE="${_build_type}" \ - -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ - -DCMAKE_C_STANDARD_LIBRARIES="-lbz2 -lfts" \ - -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ - -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \ - -DCMAKE_INSTALL_PREFIX= \ - -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \ - -DCMAKE_SYSTEM_NAME="Midipix" \ - -DENABLE_GNUTLS=:BOOL=ON \ - -DENABLE_MBEDTLS=:BOOL=OFF \ - -DGNUTLS_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DGNUTLS_LIBRARY="${PKG_PREFIX}/lib/libgnutls.lib.a" \ - -DLIBLZMA_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DLIBLZMA_LIBRARY="${PKG_PREFIX}/lib/liblzma.lib.a" \ - -DNETTLE_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DNETTLE_LIBRARY="${PKG_PREFIX}/lib/libnettle.lib.a" \ - -DOPENSSL_CRYPTO_LIBRARY="${PKG_PREFIX}/lib/libcrypto.lib.a" \ - -DOPENSSL_SSL_LIBRARY="${PKG_PREFIX}/lib/libssl.lib.a" \ - -DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.a" \ - "../libzip-${PKG_VERSION}"; + if ! rtl_fileop rm config.cache \ + || ! env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" LDFLAGS="-lbz2" PREFIX="" \ + cmake -DBZIP2_INCLUDE_DIR="${PKG_PREFIX}/include" \ + -DBZIP2_LIBRARIES="${PKG_PREFIX}/lib/libbz2.lib.a" \ + -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ + -DCMAKE_BUILD_TYPE="${_build_type}" \ + -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ + -DCMAKE_C_STANDARD_LIBRARIES="-lbz2 -lfts" \ + -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ + -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \ + -DCMAKE_INSTALL_PREFIX= \ + -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \ + -DCMAKE_SYSTEM_NAME="Midipix" \ + -DENABLE_GNUTLS=:BOOL=ON \ + -DENABLE_MBEDTLS=:BOOL=OFF \ + -DGNUTLS_INCLUDE_DIR="${PKG_PREFIX}/include" \ + -DGNUTLS_LIBRARY="${PKG_PREFIX}/lib/libgnutls.lib.a" \ + -DLIBLZMA_INCLUDE_DIR="${PKG_PREFIX}/include" \ + -DLIBLZMA_LIBRARY="${PKG_PREFIX}/lib/liblzma.lib.a" \ + -DNETTLE_INCLUDE_DIR="${PKG_PREFIX}/include" \ + -DNETTLE_LIBRARY="${PKG_PREFIX}/lib/libnettle.lib.a" \ + -DOPENSSL_CRYPTO_LIBRARY="${PKG_PREFIX}/lib/libcrypto.lib.a" \ + -DOPENSSL_SSL_LIBRARY="${PKG_PREFIX}/lib/libssl.lib.a" \ + -DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include" \ + -DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.a" \ + "../libzip-${PKG_VERSION}"; then + return 1; + fi; }; pkg_libzip_host_configure() { @@ -45,16 +46,18 @@ pkg_libzip_host_configure() { release) _build_type="Release"; ;; *) exit 1; ;; esac; - rm -f config.cache; - env PREFIX="" LDFLAGS="-L${PKG_PREFIX}/lib -lbz2 -lfts -lssl" \ - cmake -DCMAKE_BUILD_TYPE="${_build_type}" \ - -DCMAKE_C_STANDARD_LIBRARIES="-lbz2 -lcrypto -lfts" \ - -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ - -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \ - -DCMAKE_INSTALL_PREFIX= \ - -DENABLE_GNUTLS=:BOOL=OFF \ - -DENABLE_MBEDTLS=:BOOL=OFF \ - "../libzip-${PKG_VERSION}"; + if ! rtl_fileop rm config.cache \ + || ! env LDFLAGS="-L${PKG_PREFIX}/lib -lbz2 -lfts -lssl" PREFIX="" \ + cmake -DCMAKE_BUILD_TYPE="${_build_type}" \ + -DCMAKE_C_STANDARD_LIBRARIES="-lbz2 -lcrypto -lfts" \ + -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ + -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \ + -DCMAKE_INSTALL_PREFIX= \ + -DENABLE_GNUTLS=:BOOL=OFF \ + -DENABLE_MBEDTLS=:BOOL=OFF \ + "../libzip-${PKG_VERSION}"; then + return 1; + fi; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/lighttpd.vars b/vars/lighttpd.vars index a35cbeda..0c691ed2 100644 --- a/vars/lighttpd.vars +++ b/vars/lighttpd.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/llvm_host.vars b/vars/llvm_host.vars index 7d5f7a3a..f9182609 100644 --- a/vars/llvm_host.vars +++ b/vars/llvm_host.vars @@ -3,24 +3,26 @@ # pkg_llvm_host_configure() { - rtl_fileop rm "../llvm-${PKG_VERSION}-host"; - rtl_fileop mkdir "../llvm-${PKG_VERSION}-host"; - rtl_fileop cd "../llvm-${PKG_VERSION}-host"; - rtl_log_msg info "Bootstrapping llvm_host..."; - ("${PREFIX}/bin/cmake" \ - "../llvm-${PKG_VERSION}.src" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX="" \ - -DCMAKE_VERBOSE_MAKEFILE=NO \ - -DLLVM_BUILD_DOCS=NO \ - -DLLVM_BUILD_EXAMPLES=NO \ - -DLLVM_BUILD_TESTS=NO \ - -DLLVM_ENABLE_SPHINX=NO \ - -DLLVM_TARGETS_TO_BUILD=X86 \ - -DSPHINX_WARNINGS_AS_ERRORS=NO \ - -G "Unix Makefiles" \ - -Wno-dev); - rtl_log_msg info "Finished bootstrapping llvm_host."; + if ! rtl_fileop rm "../llvm-${PKG_VERSION}-host" \ + || ! rtl_fileop mkdir "../llvm-${PKG_VERSION}-host" \ + || ! rtl_fileop cd "../llvm-${PKG_VERSION}-host" \ + || ! rtl_log_msg info "Bootstrapping llvm_host..." \ + || ! ("${PREFIX}/bin/cmake" \ + "../llvm-${PKG_VERSION}.src" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX="" \ + -DCMAKE_VERBOSE_MAKEFILE=NO \ + -DLLVM_BUILD_DOCS=NO \ + -DLLVM_BUILD_EXAMPLES=NO \ + -DLLVM_BUILD_TESTS=NO \ + -DLLVM_ENABLE_SPHINX=NO \ + -DLLVM_TARGETS_TO_BUILD=X86 \ + -DSPHINX_WARNINGS_AS_ERRORS=NO \ + -G "Unix Makefiles" \ + -Wno-dev) \ + || ! rtl_log_msg info "Finished bootstrapping llvm_host."; then + return 1; + fi; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/lolcode.vars b/vars/lolcode.vars index d41d138a..282f9b5f 100644 --- a/vars/lolcode.vars +++ b/vars/lolcode.vars @@ -3,14 +3,17 @@ # pkg_lolcode_configure() { - rm -f config.cache; - env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" \ - PREFIX="" \ - cmake -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \ - -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ - -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ - -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ - -DCMAKE_CXX_COMPILER="${PREFIX}/bin/${PKG_TARGET}-g++" \ - -DCMAKE_INSTALL_PREFIX= \ - "../lci"; -} + if ! rtl_fileop rm config.cache \ + || ! env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" PREFIX="" \ + cmake -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ + -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ + -DCMAKE_CXX_COMPILER="${PREFIX}/bin/${PKG_TARGET}-g++" \ + -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="ONLY" \ + -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="NEVER" \ + -DCMAKE_INSTALL_PREFIX="" \ + "../lci"; then + return 1; + fi; +}; + +# vim:filetype=sh textwidth=0 diff --git a/vars/lua.vars b/vars/lua.vars deleted file mode 100644 index 13dd4d51..00000000 --- a/vars/lua.vars +++ /dev/null @@ -1,9 +0,0 @@ -# -# set +o errexit -o noglob is assumed. -# - -pkg_lua_configure_autotools_pre() { - autoreconf -iv; -}; - -# vim:filetype=sh diff --git a/vars/make.vars b/vars/make.vars index 3323eb39..7d44185b 100644 --- a/vars/make.vars +++ b/vars/make.vars @@ -3,7 +3,7 @@ # : ${PKG_MAKE_CONFIG_CACHE_EXTRA:=" -make_cv_synchronous_posix_spawn=yes -ac_cv_func_gettimeofday=yes"}; +ac_cv_func_gettimeofday=yes +make_cv_synchronous_posix_spawn=yes"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/mc.vars b/vars/mc.vars index d739e01e..8c01d872 100644 --- a/vars/mc.vars +++ b/vars/mc.vars @@ -5,4 +5,4 @@ : ${PKG_MC_CONFIG_CACHE_EXTRA:=" ac_list_mounted_fs=found"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/mlogin.vars b/vars/mlogin.vars deleted file mode 100644 index 1aa4d293..00000000 --- a/vars/mlogin.vars +++ /dev/null @@ -1,9 +0,0 @@ -# -# set +o errexit -o noglob is assumed. -# - -pkg_mlogin_configure_autotools_pre() { - autoreconf -iv; -}; - -# vim:filetype=sh diff --git a/vars/mpackage_host.vars b/vars/mpackage_host.vars index f65d7e8a..b04cf31d 100644 --- a/vars/mpackage_host.vars +++ b/vars/mpackage_host.vars @@ -3,8 +3,10 @@ # pkg_mpackage_host_install_make() { - rtl_fileop rm "${BUILD_WORKDIR}/mpackage"; - rtl_fileop ln_symbolic "${PKG_BASE_DIR}/${PKG_SUBDIR}" "${BUILD_WORKDIR}/mpackage"; + if ! rtl_fileop rm "${BUILD_WORKDIR}/mpackage"\ + || ! rtl_fileop ln_symbolic "${PKG_BASE_DIR}/${PKG_SUBDIR}" "${BUILD_WORKDIR}/mpackage"; then + return 1; + fi; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/musl.vars b/vars/musl.vars index 05a3c067..ed7c97bd 100644 --- a/vars/musl.vars +++ b/vars/musl.vars @@ -14,4 +14,4 @@ pkg_musl_no_complex_host_fetch_download_post() { rtl_fileop mv "${PKG_BASE_DIR}/mmglue" "${PKG_BASE_DIR}/build/mmglue"; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/mutt.vars b/vars/mutt.vars index c94970bf..733374d7 100644 --- a/vars/mutt.vars +++ b/vars/mutt.vars @@ -7,4 +7,4 @@ mutt_cv_c99_snprintf=yes mutt_cv_c99_vsnprintf=yes mutt_cv_regex_broken=no"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/nano.vars b/vars/nano.vars index 4d68ae6e..d58eb710 100644 --- a/vars/nano.vars +++ b/vars/nano.vars @@ -4,24 +4,24 @@ : ${PKG_NANO_CONFIG_CACHE_EXTRA:=" am_cv_func_working_getline=yes -gl_cv_func_working_getdelim=yes -gl_cv_func_memchr_works=yes -gl_cv_func_wcwidth_works=yes -gl_cv_func_snprintf_truncation_c99=yes -gl_cv_func_vsnprintf_zerosize_c99=yes -gl_cv_func_stat_file_slash=yes -gl_cv_func_signbit=yes -gl_cv_func_signbit_gcc=yes gl_cv_C_locale_sans_EILSEQ=yes -gl_fnmatch_cache_var=yes -gl_cv_func_working_utimes=yes -gl_cv_func_snprintf_retval_c99=yes -gl_cv_func_printf_sizes_c99=yes -gl_cv_func_printf_infinite=yes +gl_cv_func_memchr_works=yes gl_cv_func_printf_directive_a=no gl_cv_func_printf_directive_f=yes gl_cv_func_printf_directive_ls=yes +gl_cv_func_printf_enomem=yes gl_cv_func_printf_flag_zero=yes -gl_cv_func_printf_enomem=yes"}; +gl_cv_func_printf_infinite=yes +gl_cv_func_printf_sizes_c99=yes +gl_cv_func_signbit_gcc=yes +gl_cv_func_signbit=yes +gl_cv_func_snprintf_retval_c99=yes +gl_cv_func_snprintf_truncation_c99=yes +gl_cv_func_stat_file_slash=yes +gl_cv_func_vsnprintf_zerosize_c99=yes +gl_cv_func_wcwidth_works=yes +gl_cv_func_working_getdelim=yes +gl_cv_func_working_utimes=yes +gl_fnmatch_cache_var=yes"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/nasm_host.vars b/vars/nasm_host.vars index 2b67eab5..9d697a27 100644 --- a/vars/nasm_host.vars +++ b/vars/nasm_host.vars @@ -5,9 +5,10 @@ pkg_nasm_host_install_make_post() { local _fname=""; for _fname in bin/nasm bin/ndisasm share/man/man1/nasm.1 share/man/man1/ndisasm.1; do - rtl_fileop mv "${PKG_DESTDIR}/${_fname}" \ - "${PKG_DESTDIR}/${_fname%/*}/${PKG_TARGET}-${_fname##*/}"; + if ! rtl_fileop mv "${PKG_DESTDIR}/${_fname}" "${PKG_DESTDIR}/${_fname%/*}/${PKG_TARGET}-${_fname##*/}"; then + return 1; + fi; done; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/nginx.vars b/vars/nginx.vars index 478d70d5..f49f26dd 100644 --- a/vars/nginx.vars +++ b/vars/nginx.vars @@ -5,7 +5,7 @@ pkg_nginx_configure() { export CFLAGS="${PKG_CFLAGS_CONFIGURE} -I${PKG_PREFIX}/include -pipe -W -Wall -Wpointer-arith -Wno-unused-parameter -Werror"; export LDFLAGS="${PKG_LDFLAGS_CONFIGURE} -L${PKG_PREFIX}/lib"; - rtl_fileop mkdir objs/src objs/src/core objs/src/event objs/src/event/modules objs/src/http objs/src/http/modules objs/src/os/unix; + rtl_fileop mkdir "objs/src" "objs/src/core" "objs/src/event" "objs/src/event/modules" "objs/src/http" "objs/src/http/modules" "objs/src/os/unix"; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/nullmailer.vars b/vars/nullmailer.vars index e1743c04..b20d725f 100644 --- a/vars/nullmailer.vars +++ b/vars/nullmailer.vars @@ -2,12 +2,13 @@ # set +o errexit -o noglob is assumed. # -pkg_nullmailer_configure_autotools_pre() { - touch ${PKG_BUILD_DIR}/ChangeLog - autoreconf -iv; -}; - : ${PKG_NULLMAILER_CONFIG_CACHE_EXTRA:=" local_cv_flag_NAMEDPIPEBUG=no"}; -# vim:filetype=sh +pkg_nullmailer_configure_autotools_pre() { + if ! touch "${PKG_BUILD_DIR}/ChangeLog"; then + return 1; + fi; +}; + +# vim:filetype=sh textwidth=0 diff --git a/vars/openbsd_baseutils.vars b/vars/openbsd_baseutils.vars index 3c2d7f24..e8ce809f 100644 --- a/vars/openbsd_baseutils.vars +++ b/vars/openbsd_baseutils.vars @@ -3,12 +3,14 @@ # pkg_openbsd_baseutils_build() { - make -C ${PKG_BUILD_DIR}/libopenbsd CC="${DEFAULT_TARGET}-gcc --sysroot=${PREFIX_NATIVE}" - make -C ${PKG_BUILD_DIR}/pax CC="${DEFAULT_TARGET}-gcc --sysroot=${PREFIX_NATIVE}" + if ! make -C "${PKG_BUILD_DIR}/libopenbsd" CC="${DEFAULT_TARGET}-gcc --sysroot=${PREFIX_NATIVE}"\ + || ! make -C "${PKG_BUILD_DIR}/pax" CC="${DEFAULT_TARGET}-gcc --sysroot=${PREFIX_NATIVE}"; then + return 1; + fi; }; pkg_openbsd_baseutils_install_make() { - make -C ${PKG_BUILD_DIR}/pax install PREFIX="${PKG_DESTDIR}" MANDIR="${PKG_DESTDIR}/share/man" + make -C "${PKG_BUILD_DIR}/pax" install MANDIR="${PKG_DESTDIR}/share/man" PREFIX="${PKG_DESTDIR}"; } -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/openjpeg.vars b/vars/openjpeg.vars index e05debf0..b165f0ff 100644 --- a/vars/openjpeg.vars +++ b/vars/openjpeg.vars @@ -3,28 +3,31 @@ # pkg_openjpeg_configure() { - rm -f config.cache; - env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" \ - PREFIX="" \ - cmake -DCMAKE_FIND_ROOT_PATH="${PKG_PREFIX}" \ - -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \ - -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \ - -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ - -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ - -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ - -DCMAKE_CXX_COMPILER="${PREFIX}/bin/${PKG_TARGET}-g++" \ - -DCMAKE_INSTALL_PREFIX= \ - -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \ - -DLCMS2_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DLCMS2_LIBRARY="${PKG_PREFIX}/lib/liblcms2.lib.a" \ - -DPNG_LIBRARY_DEBUG="${PKG_PREFIX}/lib/libpng.lib.a" \ - -DPNG_LIBRARY_RELEASE="${PKG_PREFIX}/lib/libpng.lib.a" \ - -DPNG_PNG_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DTIFF_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DTIFF_LIBRARY_DEBUG="${PKG_PREFIX}/lib/libtiff.lib.a" \ - -DTIFF_LIBRARY_RELEASE="${PKG_PREFIX}/lib/libtiff.lib.a" \ - -DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DZLIB_LIBRARY_DEBUG="${PKG_PREFIX}/lib/libz.a" \ - -DZLIB_LIBRARY_RELEASE="${PKG_PREFIX}/lib/libz.a" \ - "../openjpeg-${PKG_VERSION}"; -} + if ! rtl_fileop rm config.cache \ + || ! env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" PREFIX="" \ + cmake -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ + -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ + -DCMAKE_CXX_COMPILER="${PREFIX}/bin/${PKG_TARGET}-g++" \ + -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="ONLY" \ + -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY="ONLY" \ + -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="NEVER" \ + -DCMAKE_FIND_ROOT_PATH="${PKG_PREFIX}" \ + -DCMAKE_INSTALL_PREFIX="" \ + -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \ + -DLCMS2_INCLUDE_DIR="${PKG_PREFIX}/include" \ + -DLCMS2_LIBRARY="${PKG_PREFIX}/lib/liblcms2.lib.a" \ + -DPNG_LIBRARY_DEBUG="${PKG_PREFIX}/lib/libpng.lib.a" \ + -DPNG_LIBRARY_RELEASE="${PKG_PREFIX}/lib/libpng.lib.a" \ + -DPNG_PNG_INCLUDE_DIR="${PKG_PREFIX}/include" \ + -DTIFF_INCLUDE_DIR="${PKG_PREFIX}/include" \ + -DTIFF_LIBRARY_DEBUG="${PKG_PREFIX}/lib/libtiff.lib.a" \ + -DTIFF_LIBRARY_RELEASE="${PKG_PREFIX}/lib/libtiff.lib.a" \ + -DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include" \ + -DZLIB_LIBRARY_DEBUG="${PKG_PREFIX}/lib/libz.a" \ + -DZLIB_LIBRARY_RELEASE="${PKG_PREFIX}/lib/libz.a" \ + "../openjpeg-${PKG_VERSION}"; then + return 1; + fi; +}; + +# vim:filetype=sh textwidth=0 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 diff --git a/vars/pkgconf_host.vars b/vars/pkgconf_host.vars index df63adfb..fe576fbe 100644 --- a/vars/pkgconf_host.vars +++ b/vars/pkgconf_host.vars @@ -4,9 +4,11 @@ pkg_pkgconf_host_install_make_post() { if [ -e "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config" ]; then - rtl_fileop rm "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config"; + if ! rtl_fileop rm "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config"; then + return 1; + fi; fi; - cat > "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config" <<EOF + if ! cat > "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config" <<EOF #!/bin/sh if [ -z "\${PREFIX_NATIVE}" ]; then PREFIX_NATIVE="${PREFIX_NATIVE}"; @@ -18,15 +20,21 @@ else "\$(dirname "\${0}")"/pkgconf --define-variable=prefix="\${PREFIX_NATIVE%/}/" --keep-system-cflags "\${@}"; fi; EOF - chmod +x "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config"; - rtl_fileop rm "${PKG_DESTDIR}/bin/pkg-config"; + then + return 1; + elif ! rtl_fileop chmod +x "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config"\ + || ! rtl_fileop rm "${PKG_DESTDIR}/bin/pkg-config"; then + return 1; + fi; }; pkg_pkgconf_install_make_post() { if [ -e "${PREFIX_NATIVE}/bin/pkg-config" ]; then - rtl_fileop rm "${PREFIX_NATIVE}/bin/pkg-config"; + if ! rtl_fileop rm "${PREFIX_NATIVE}/bin/pkg-config"; then + return 1; + fi; fi; rtl_fileop ln_symbolic pkgconf "${PREFIX_NATIVE}/bin/pkg-config"; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/procps_ng.vars b/vars/procps_ng.vars index a09852f3..a945cb23 100644 --- a/vars/procps_ng.vars +++ b/vars/procps_ng.vars @@ -5,4 +5,4 @@ : ${PKG_PROCPS_NG_CONFIG_CACHE_EXTRA:=" ac_cv_func_realloc_0_nonnull=yes"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/psxstub_host.vars b/vars/psxstub_host.vars index 7cef39d5..42282dcc 100644 --- a/vars/psxstub_host.vars +++ b/vars/psxstub_host.vars @@ -3,14 +3,16 @@ # pkg_psxstub_install_make() { - if [ "${PKG_TARGET}" = i686-nt32-midipix ] \ - || [ "${PKG_TARGET}" = x86_64-nt64-midipix ]; then - rtl_fileop cd "${PKG_BASE_DIR}/psxstub"; - make ${PKG_MAKEFLAGS_BUILD} "DESTDIR=${PKG_PREFIX}" "TARGET=${PKG_TARGET}" install; - if [ -e "${PKG_PREFIX}/lib/libpsxscl.a" ]; then - rtl_fileop rm "${PKG_PREFIX}/lib/libpsxscl.a"; + if [ "${PKG_TARGET}" = "i686-nt32-midipix" ]\ + || [ "${PKG_TARGET}" = "x86_64-nt64-midipix" ]; then + if ! rtl_fileop cd "${PKG_BASE_DIR}/psxstub"\ + || ! make ${PKG_MAKEFLAGS_BUILD} "DESTDIR=${PKG_PREFIX}" "TARGET=${PKG_TARGET}" install; then + return 1; + elif [ -e "${PKG_PREFIX}/lib/libpsxscl.a" ]\ + && ! rtl_fileop rm "${PKG_PREFIX}/lib/libpsxscl.a"; then + return 1; fi; fi; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/python2.vars b/vars/python2.vars index 669e4626..ccb1d5b0 100644 --- a/vars/python2.vars +++ b/vars/python2.vars @@ -3,14 +3,16 @@ # pkg_python2_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"; - ex_pkg_state_set "${PKG_NAME}" fetch_download -fetch_extract; + 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"\ + || ! ex_pkg_state_set "${PKG_NAME}" "fetch_download" "-fetch_extract"; then + return 1; + fi; }; pkg_python2_minipix_fetch_download() { pkg_python2_fetch_download "${@}"; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 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 diff --git a/vars/python3.vars b/vars/python3.vars index 2aeabae5..b1bd7b58 100644 --- a/vars/python3.vars +++ b/vars/python3.vars @@ -3,10 +3,12 @@ # pkg_python3_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"; - ex_pkg_state_set "${PKG_NAME}" fetch_download -fetch_extract; + 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"\ + || ! ex_pkg_state_set "${PKG_NAME}" "fetch_download" "-fetch_extract"; then + return 1; + fi; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 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 diff --git a/vars/rc.vars b/vars/rc.vars index 2b82de51..e6117df8 100644 --- a/vars/rc.vars +++ b/vars/rc.vars @@ -3,8 +3,8 @@ # : ${PKG_RC_CONFIG_CACHE_EXTRA:=" -rc_cv_sysv_sigcld=no ac_cv_func_setpgrp_void=yes -rc_cv_sys_dev_fd=yes"}; +rc_cv_sys_dev_fd=yes +rc_cv_sysv_sigcld=no"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/rpm_host.vars b/vars/rpm_host.vars index dd977f74..ca2e20bd 100644 --- a/vars/rpm_host.vars +++ b/vars/rpm_host.vars @@ -3,9 +3,11 @@ # pkg_rpm_host_install_pre() { - echo "#!/bin/true" > "${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" <<EOF + if ! cat > "${PKG_DESTDIR}/bin/makeinfo" <<EOF #!/bin/sh export PERL5LIB="${PREFIX}/share/texinfo:${PREFIX}/share/texinfo/lib/libintl-perl/lib:${PREFIX}/share/texinfo/lib/Text-Unidecode/lib:${PREFIX}/share/texinfo/lib/Unicode-EastAsianWidth/lib"; makeinfo.dist "\${@}"; EOF - chmod +x "${PKG_DESTDIR}/bin/makeinfo"; +then + return 1; + else + rtl_fileop chmod +x "${PKG_DESTDIR}/bin/makeinfo"; + fi; }; # vim:filetype=sh textwidth=0 diff --git a/vars/tzdb_host.vars b/vars/tzdb_host.vars index 3fa187cd..764bc4ef 100644 --- a/vars/tzdb_host.vars +++ b/vars/tzdb_host.vars @@ -6,4 +6,4 @@ pkg_tzdb_host_install_pre() { rtl_fileop rm "${PKG_DESTDIR}/etc"; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/util_linux.vars b/vars/util_linux.vars index ba4d30e8..f3bb7e73 100644 --- a/vars/util_linux.vars +++ b/vars/util_linux.vars @@ -5,4 +5,4 @@ : ${PKG_UTIL_LINUX_CONFIG_CACHE_EXTRA:=" ac_cv_prog_NCURSESW6_CONFIG=%PREFIX%/bin/ncursesw6-config"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/vim.vars b/vars/vim.vars index d91af66c..9f1adcef 100644 --- a/vars/vim.vars +++ b/vars/vim.vars @@ -15,14 +15,14 @@ vim_cv_toupper_broken=no vim_cv_tty_group=tty vim_cv_tty_mode=0666"}; +: ${PKG_VIM_MINIPIX_CONFIG_CACHE_EXTRA:="${PKG_VIM_CONFIG_CACHE_EXTRA}"}; + pkg_vim_configure_autotools_post() { - rtl_fileop cp config.cache src/auto; + rtl_fileop cp "config.cache" "src/auto"; }; -: ${PKG_VIM_MINIPIX_CONFIG_CACHE_EXTRA=${PKG_VIM_CONFIG_CACHE_EXTRA}}; - pkg_vim_minipix_configure_autotools_post() { - rtl_fileop cp config.cache src/auto; + rtl_fileop cp "config.cache" "src/auto"; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/w3m.vars b/vars/w3m.vars index 898fb6b3..94f3bc00 100644 --- a/vars/w3m.vars +++ b/vars/w3m.vars @@ -5,4 +5,4 @@ : ${PKG_W3M_CONFIG_CACHE_EXTRA:=" ac_cv_func_setpgrp_void=yes"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/xcb.vars b/vars/xcb.vars index bae1e2d2..b913831e 100644 --- a/vars/xcb.vars +++ b/vars/xcb.vars @@ -5,4 +5,4 @@ : ${PKG_XCB_CONFIG_CACHE_EXTRA:=" ac_cv_search_sendmsg=no"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/yabasic.vars b/vars/yabasic.vars index 1168342a..5ef50608 100644 --- a/vars/yabasic.vars +++ b/vars/yabasic.vars @@ -5,4 +5,4 @@ : ${PKG_YABASIC_CONFIG_CACHE_EXTRA:=" ac_cv_func_strtod=yes"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 diff --git a/vars/zsh.vars b/vars/zsh.vars index 2ebbfbe3..12ffcbdf 100644 --- a/vars/zsh.vars +++ b/vars/zsh.vars @@ -5,4 +5,4 @@ : ${PKG_ZSH_CONFIG_CACHE_EXTRA:=" zsh_cv_sys_elf=no"}; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 |