From 87c7b81d9bd97eb11aea5ba1c0c6fcade3c1c891 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 24 Oct 2011 21:21:23 +0200 Subject: [PATCH] xbps-src: unset -v for vars, -f for funcs. --- xbps-src/shutils/tmpl_funcs.sh.in | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/xbps-src/shutils/tmpl_funcs.sh.in b/xbps-src/shutils/tmpl_funcs.sh.in index 647101ca21a..fc495b953df 100644 --- a/xbps-src/shutils/tmpl_funcs.sh.in +++ b/xbps-src/shutils/tmpl_funcs.sh.in @@ -92,8 +92,7 @@ reset_tmpl_vars() short_desc maintainer long_desc checksum wrksrc \ make_cmd bootstrap register_shell keep_empty_dirs \ make_build_target configure_script noextract nofetch \ - pre_configure pre_build pre_install build_depends \ - post_configure post_build post_install nostrip \ + build_depends nostrip \ make_install_target version revision patch_args \ sgml_catalogs xml_catalogs xml_entries sgml_entries \ disable_parallel_build run_depends font_dirs preserve \ @@ -104,15 +103,20 @@ reset_tmpl_vars() build_wrksrc create_wrksrc broken_as_needed pkgver \ ignore_vdeps_dir noverifyrdeps conflicts dkms_modules \ gconf_entries gconf_schemas stow_copy stow_copy_files \ - pre_remove post_remove post_stow do_build do_install \ pycompile_dirs pycompile_module systemd_services \ - homepage license kernel_hooks_version do_configure \ - do_fetch \ + homepage license kernel_hooks_version \ SUBPKG XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \ XBPS_BUILD_DONE XBPS_INSTALL_DONE FILESDIR DESTDIR \ SRCPKGDESTDIR PATCHESDIR CFLAGS CXXFLAGS CPPFLAGS \ CC CXX LDFLAGS LD_LIBRARY_PATH" - eval unset "$TMPL_VARS" + + local TMPL_FUNCS="pre_configure pre_build pre_install do_build \ + do_install do_configure post_configure post_build \ + post_install do_fetch pre_remove post_remove \ + post_stow" + + eval unset -v "$TMPL_VARS" + eval unset -f "$TMPL_FUNCS" } #