Page MenuHomeFreeBSD
Files F159225332

D36849.diff
No OneTemporary
Actions

D36849.diff
View Options

diff --git a/shells/bash/Makefile b/shells/bash/Makefile
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -5,7 +5,7 @@
#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_USES= readline
PORTS_READLINE_CONFIGURE_WITH= installed-readline
-STATIC_BROKEN= multiple definition of strtoimax
-
.if empty(PKGNAMESUFFIX)
CONFLICTS+= bash-static bash52-static
.else
diff --git a/shells/bash/files/patch-configure b/shells/bash/files/patch-configure
new file mode 100644
--- /dev/null
+++ b/shells/bash/files/patch-configure
@@ -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"
diff --git a/shells/bash/files/patch-m4_strtoimax.m4 b/shells/bash/files/patch-m4_strtoimax.m4
new file mode 100644
--- /dev/null
+++ b/shells/bash/files/patch-m4_strtoimax.m4
@@ -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
+ ])

File Metadata

Mime Type
text/plain
Expires
Fri, Jun 12, 1:34 PM (17 h, 45 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33908524
Default Alt Text
D36849.diff (1 KB)

Event Timeline