diff options
| author | bapt <bapt@FreeBSD.org> | 2013-12-26 01:42:54 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2013-12-26 01:42:54 +0800 |
| commit | 9c8bc832767172b30442ac441a12d1af336d76fd (patch) | |
| tree | 573ae345e898fe023c1a4bc9e69b4ba3b5645395 | |
| parent | d203da6a1636fe199a64cc6eff517216d9093856 (diff) | |
| download | freebsd-ports-gnome-9c8bc832767172b30442ac441a12d1af336d76fd.tar.gz freebsd-ports-gnome-9c8bc832767172b30442ac441a12d1af336d76fd.tar.zst freebsd-ports-gnome-9c8bc832767172b30442ac441a12d1af336d76fd.zip | |
Fix inconsistency in building bash
Ensure the configure script always activate the same features wether or not
fdescfs is mounted: Always consider /dev/fd as absent
Bump portrevision as packages on the cluster are built with fdescfs mounted.
With hat: portmgr
Reported: Derek Schrock (skered- via #poudriere)
| -rw-r--r-- | shells/bash-devel/Makefile | 6 | ||||
| -rw-r--r-- | shells/bash/Makefile | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/shells/bash-devel/Makefile b/shells/bash-devel/Makefile index 79bfe1053a2d..037e95050791 100644 --- a/shells/bash-devel/Makefile +++ b/shells/bash-devel/Makefile @@ -4,7 +4,7 @@ PORTNAME= bash PATCHLEVEL= 45 PORTVERSION= 4.2.${PATCHLEVEL:S/^0//g} -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= shells MASTER_SITES= GNU MASTER_SITE_SUBDIR= ${PORTNAME} @@ -82,7 +82,9 @@ CPPFLAGS+= ${PTHREAD_CFLAGS} \ -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= YACC="bison -y" +CONFIGURE_ENV= YACC="bison -y" \ + bash_cv_dev_fd=absent + post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1 diff --git a/shells/bash/Makefile b/shells/bash/Makefile index bb5d1910efbf..1139334bd2e2 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -4,7 +4,7 @@ PORTNAME= bash PATCHLEVEL= 45 PORTVERSION= 4.2.${PATCHLEVEL:S/^0//g} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= shells MASTER_SITES= ${MASTER_SITE_GNU:S/$/:bash/} \ ftp://ftp.cwru.edu/pub/%SUBDIR%/:faq @@ -91,7 +91,8 @@ CPPFLAGS+= ${PTHREAD_CFLAGS} \ -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= YACC="bison -y" +CONFIGURE_ENV= YACC="bison -y" \ + bash_cv_dev_fd=absent post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1 |