diff options
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/bash-static/Makefile | 2 | ||||
| -rw-r--r-- | shells/bash/Makefile | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/shells/bash-static/Makefile b/shells/bash-static/Makefile index 363a823cd52..87482ecf439 100644 --- a/shells/bash-static/Makefile +++ b/shells/bash-static/Makefile @@ -5,4 +5,6 @@ MASTERDIR= ${.CURDIR}/../../shells/bash OPTIONS_SLAVE= STATIC +PKGNAMESUFFIX= -static + .include "${MASTERDIR}/Makefile" diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 3a3577d4ce7..4830ad82c7b 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -56,6 +56,12 @@ CONFIGURE_ARGS+= --without-bash-malloc \ --disable-rpath \ --enable-disabled-builtins +.if empty(PKGNAMESUFFIX) +CONFLICTS+= bash-static-[0-9]* +.else +CONFLICTS+= bash-[0-9]* +.endif + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MIMPORTFUNCTIONS} @@ -66,11 +72,8 @@ CFLAGS+= -DIMPORT_FUNCTIONS_DEF=0 .if ${PORT_OPTIONS:MSTATIC} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:tl} != "no") CONFIGURE_ARGS+= --enable-static-link -PKGNAMESUFFIX= -static -CONFLICTS+= bash-[0-9]* .else CONFIGURE_ARGS+= --disable-static-link -CONFLICTS+= bash-static-[0-9]* .endif post-patch: |