diff options
| -rw-r--r-- | mk/bsd.pkg.defaults.mk | 7 | ||||
| -rw-r--r-- | shells/bash2/Makefile | 20 |
2 files changed, 18 insertions, 9 deletions
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index 7bd063019b4..a5f62a21dd0 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.defaults.mk,v 1.274 2004/08/07 14:13:06 xtraeme Exp $ +# $NetBSD: bsd.pkg.defaults.mk,v 1.275 2004/08/07 21:03:59 minskim Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -703,11 +703,6 @@ ATERM_USE_GREEK?= NO # but it has problems with threads and does not work yet. # Default: not defined -#BASH_STATIC= YES -# Used in bash2 to link it statically (for use as a root shell). -# Possible: not defined, YES -# Default: not defined - #BATTLEBALL_USE_MESA= # Used in battleball to build in support for OpenGL/Mesa. Will use # Mesa-glx (rather than Mesa) if Mesa-glx is already installed. diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index a923ce9aa0c..b91daf8f413 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2004/07/11 01:23:29 salo Exp $ +# $NetBSD: Makefile,v 1.55 2004/08/07 21:03:59 minskim Exp $ # DISTNAME= bash-2.05b @@ -30,9 +30,23 @@ PKG_SHELL= ${PREFIX}/bin/bash .include "../../mk/bsd.prefs.mk" -BUILD_DEFS+= BASH_STATIC +# Global and legacy options +.if defined(BASH_STATIC) +. if !defined(PKG_OPTIONS.bash) +. if defined(BASH_STATIC) && !empty(BASH_STATIC:M[yY][eE][sS]) +PKG_OPTIONS.bash+= static +. endif +. endif +.endif + +PKG_OPTIONS_VAR= PKG_OPTIONS.bash +PKG_SUPPORTED_OPTIONS= static +.include "../../mk/bsd.options.mk" -.if defined(BASH_STATIC) && !empty(BASH_STATIC:M[yY][eE][sS]) +## +## Static link +## +.if !empty(PKG_OPTIONS:Mstatic) CONFIGURE_ARGS+= --enable-static-link .endif |