CVS commit: pkgsrc/shells/dash

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Jun 22 15:16:59 UTC 2021

Modified Files:
        pkgsrc/shells/dash: distinfo
        pkgsrc/shells/dash/patches: patch-configure

Log Message:
Check a little harder for stat64. Fixes the build on my M1 with
Big Sur 11.4.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/shells/dash/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/shells/dash/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/shells/dash/distinfo
diff -u pkgsrc/shells/dash/distinfo:1.11 pkgsrc/shells/dash/distinfo:1.12
--- pkgsrc/shells/dash/distinfo:1.11    Sat Jun 12 08:48:03 2021
+++ pkgsrc/shells/dash/distinfo Tue Jun 22 15:16:59 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2021/06/12 08:48:03 nia Exp $
+$NetBSD: distinfo,v 1.12 2021/06/22 15:16:59 schmonz Exp $
 
 SHA1 (dash-0.5.11.4.tar.gz) = 7db380af711c64d2864657f33aa3cccbfaf88de3
 RMD160 (dash-0.5.11.4.tar.gz) = 0960de99180e8a668827a58256c23d9bef0615a1
 SHA512 (dash-0.5.11.4.tar.gz) = 2344782b80f69b74d00eb153a918c2293eec2316825bf83c1eb4ff787eddf78f67ca3026cfce39b1db8d5ede69c7268951eec1e5711903f2306714b665f84160
 Size (dash-0.5.11.4.tar.gz) = 240652 bytes
-SHA1 (patch-configure) = 2876f5f8221ec26595cd8ad85ec4c4c0eacf9c45
+SHA1 (patch-configure) = 0346ce553f3971ded5821553486f26a96bc6be18

Index: pkgsrc/shells/dash/patches/patch-configure
diff -u pkgsrc/shells/dash/patches/patch-configure:1.1 pkgsrc/shells/dash/patches/patch-configure:1.2
--- pkgsrc/shells/dash/patches/patch-configure:1.1      Mon May 15 14:52:44 2017
+++ pkgsrc/shells/dash/patches/patch-configure  Tue Jun 22 15:16:59 2021
@@ -1,25 +1,27 @@
-$NetBSD: patch-configure,v 1.1 2017/05/15 14:52:44 jperkin Exp $
+$NetBSD: patch-configure,v 1.2 2021/06/22 15:16:59 schmonz Exp $
 
 Check for stat64 declaration too.
 
---- configure.orig     2016-09-23 14:51:16.000000000 +0000
+--- configure.orig     2021-06-04 07:50:42.000000000 +0000
 +++ configure
-@@ -4685,6 +4685,10 @@ fi
+@@ -4852,11 +4852,17 @@ fi
  
  fi
  
-+ac_fn_c_check_decl "$LINENO" "stat64" "ac_cv_decl_stat64" "$ac_includes_default
-+"
-+if test "x$ac_cv_decl_stat64" = xyes; then :
-+else
- ac_fn_c_check_func "$LINENO" "stat64" "ac_cv_func_stat64"
- if test "x$ac_cv_func_stat64" = xyes; then :
- 
-@@ -4701,6 +4705,7 @@ $as_echo "#define stat64 stat" >>confdef
+-ac_fn_c_check_func "$LINENO" "stat64" "ac_cv_func_stat64"
+-if test "x$ac_cv_func_stat64" = xyes; then :
++ac_fn_c_check_decl "$LINENO" "stat64" "ac_cv_have_decl_stat64" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
++if test "x$ac_cv_have_decl_stat64" = xyes
++then :
++  ac_fn_c_check_func "$LINENO" "stat64" "ac_cv_func_stat64"
++if test "x$ac_cv_func_stat64" = xyes
++then :
  
+-else
++fi
  
- fi
 +fi
++if test "$ac_cv_func_stat64" != yes; then
  
+ $as_echo "#define fstat64 fstat" >>confdefs.h
  
- ac_fn_c_check_func "$LINENO" "open64" "ac_cv_func_open64"