From a344468556c4dea2ebc63d0ee2652437eac1314a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 15 Oct 2009 16:16:09 +0200 Subject: [PATCH] shutils: remove support for $configure_shell. There is not much gain supporting this... --HG-- extra : convert_revision : xtraeme%40gmail.com-20091015141609-0g7h8y18aw1i9arx --- shutils/configure_funcs.sh | 12 +++--------- shutils/tmpl_funcs.sh | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/shutils/configure_funcs.sh b/shutils/configure_funcs.sh index c1c83e1d..9795f0eb 100644 --- a/shutils/configure_funcs.sh +++ b/shutils/configure_funcs.sh @@ -1,5 +1,5 @@ #- -# Copyright (c) 2008 Juan Romero Pardines. +# Copyright (c) 2008-2009 Juan Romero Pardines. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -78,18 +78,12 @@ configure_src_phase() . $XBPS_SHUTILSDIR/buildvars_funcs.sh set_build_vars - if [ -z "${configure_shell}" ]; then - configure_shell=/bin/bash - fi - # # Packages using GNU autoconf # if [ "$build_style" = "gnu_configure" ]; then - env CONFIG_SHELL=${configure_shell} ${configure_script} \ - --prefix=/usr --sysconfdir=/etc \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ + ${configure_script} --prefix=/usr --sysconfdir=/etc \ + --infodir=/usr/share/info --mandir=/usr/share/man \ ${configure_args} # # Packages using propietary configure scripts. diff --git a/shutils/tmpl_funcs.sh b/shutils/tmpl_funcs.sh index c28f5281..8bc106d8 100644 --- a/shutils/tmpl_funcs.sh +++ b/shutils/tmpl_funcs.sh @@ -68,7 +68,7 @@ reset_tmpl_vars() short_desc maintainer long_desc checksum wrksrc \ make_cmd base_chroot register_shell \ make_build_target configure_script noextract nofetch \ - pre_configure pre_build pre_install configure_shell \ + pre_configure pre_build pre_install \ post_configure post_build post_install \ make_install_target version revision essential \ sgml_catalogs xml_catalogs xml_entries sgml_entries \