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/pkgconf_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/pkgconf_host.vars')
| -rw-r--r-- | vars/pkgconf_host.vars | 20 |
1 files changed, 14 insertions, 6 deletions
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 |