diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-05-05 08:39:30 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-05-05 08:39:30 +0000 |
| commit | ef5b0dd1611f85b045f1097c9098466f754251fb (patch) | |
| tree | 0254efc28697a24b3d04afbea35d4139639092dc /shells | |
| parent | Using gmake does not fix build with bmake at all, reverting (diff) | |
Fix bash-static slave ports with bash being now using new options framework
Notes
Notes:
svn path=/head/; revision=317405
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/bash-static/Makefile | 8 | ||||
| -rw-r--r-- | shells/bash/Makefile | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/shells/bash-static/Makefile b/shells/bash-static/Makefile index 3555e40cdf78..e29ab9b24ae0 100644 --- a/shells/bash-static/Makefile +++ b/shells/bash-static/Makefile @@ -1,12 +1,8 @@ -# Ports collection makefile for: bash-static -# Date created: 22 Jan 2009 -# Whom: Emanuel Haupt <ehaupt@FreeBSD.org> -# +# Created by: Emanuel Haupt <ehaupt@FreeBSD.org> # $FreeBSD$ -# MASTERDIR= ${.CURDIR}/../../shells/bash -WITH_STATIC_BASH= yes +OPTIONS_SLAVE= STATIC .include "${MASTERDIR}/Makefile" diff --git a/shells/bash/Makefile b/shells/bash/Makefile index a4f64c7de24e..9208cb1912b6 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -61,7 +61,7 @@ CONFIGURE_ARGS= --without-bash-malloc \ --disable-rpath \ --enable-disabled-builtins -.if ${PORT_OPTIONS:MSTATIC_BASH} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:L} != "no") +.if ${PORT_OPTIONS:MSTATIC} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:L} != "no") CONFIGURE_ARGS+= --enable-static-link PKGNAMESUFFIX= -static CONFLICTS+= bash-[0-9]* bash-devel-[0-9]* bash-static-devel-[0-9]* |