shells/bash: fix static build

The logic in m4/strtoimax.m4 is inverted: it replaces strtoimax() if and only
if it is present and functional.

files/patch-configure avoids having to run autoreconf in the port and can be
removed once the fix has been adopted upstream.

differential Revision:  https://reviews.freebsd.org/D36849
This commit is contained in:
Dag-Erling Smørgrav 2022-10-01 12:11:01 +02:00 committed by Emanuel Haupt
parent 270d325584
commit 3e147a1f59
3 changed files with 23 additions and 3 deletions

View File

@ -5,7 +5,7 @@ PORTNAME= bash
#PATCHLEVEL= 0
#PORTVERSION= 5.2.${PATCHLEVEL:S/^0//g}
PORTVERSION= 5.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= shells
MASTER_SITES= GNU
#DISTNAME= ${PORTNAME}-${PORTVERSION:R}
@ -59,8 +59,6 @@ PORTS_READLINE_BROKEN= ld: error: undefined symbol: rl_trim_arg_from_keyseq
PORTS_READLINE_USES= readline
PORTS_READLINE_CONFIGURE_WITH= installed-readline
STATIC_BROKEN= multiple definition of strtoimax
.if empty(PKGNAMESUFFIX)
CONFLICTS+= bash-static bash52-static
.else

View File

@ -0,0 +1,11 @@
--- configure.orig 2022-09-23 14:13:22 UTC
+++ configure
@@ -20443,7 +20443,7 @@ fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bash_cv_func_strtoimax" >&5
printf "%s\n" "$bash_cv_func_strtoimax" >&6; }
-if test $bash_cv_func_strtoimax = yes; then
+if test $bash_cv_func_strtoimax = no ; then
case " $LIBOBJS " in
*" strtoimax.$ac_objext "* ) ;;
*) LIBOBJS="$LIBOBJS strtoimax.$ac_objext"

View File

@ -0,0 +1,11 @@
--- m4/strtoimax.m4.orig 2022-04-11 20:31:52 UTC
+++ m4/strtoimax.m4
@@ -29,7 +29,7 @@ AC_CACHE_VAL(bash_cv_func_strtoimax,
fi
])
AC_MSG_RESULT($bash_cv_func_strtoimax)
-if test $bash_cv_func_strtoimax = yes; then
+if test $bash_cv_func_strtoimax = no; then
AC_LIBOBJ(strtoimax)
fi
])