CVS commit: pkgsrc/shells/bash

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Jan 28 20:39:20 UTC 2022

Modified Files:
        pkgsrc/shells/bash: distinfo
        pkgsrc/shells/bash/patches: patch-support_shobj-conf

Log Message:
Omit the special -arch_only treatment for old Darwin; it's not supported
by external compilers (e.g., lang/gcc10) and it's not needed by the
native compiler (at least, not on Snow Leopard gcc 4.2.1).


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/shells/bash/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/shells/bash/patches/patch-support_shobj-conf

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

Modified files:

Index: pkgsrc/shells/bash/distinfo
diff -u pkgsrc/shells/bash/distinfo:1.69 pkgsrc/shells/bash/distinfo:1.70
--- pkgsrc/shells/bash/distinfo:1.69    Wed Jan  5 20:50:16 2022
+++ pkgsrc/shells/bash/distinfo Fri Jan 28 20:39:20 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.69 2022/01/05 20:50:16 wiz Exp $
+$NetBSD: distinfo,v 1.70 2022/01/28 20:39:20 schmonz Exp $
 
 BLAKE2s (bash-5.1.tar.gz) = 9053924a9a02eb9e6d9aed99e945c23ddd98481234a50c5897f124dc3f02dd33
 SHA512 (bash-5.1.tar.gz) = c44a0ce381469219548a3a27589af3fea4f22eda1ca4e9434b59fc16da81b471c29ce18e31590e0860a6a251a664b68c2b45e3a17d22cfc02799ffd9a208390c
@@ -58,4 +58,4 @@ SHA1 (patch-builtins_ulimit.def) = 13900
 SHA1 (patch-configure) = c4e1ab53a1ee85f3e6121047f0aca8ceb85e6e5d
 SHA1 (patch-examples_loadables_fdflags.c) = dce409c76b7d6c838eb25c3ccc7a89ee57ca69b8
 SHA1 (patch-lib_malloc_malloc.c) = fc22c2bb45490c57782d34d62336d168875c3609
-SHA1 (patch-support_shobj-conf) = 8750c104549ea8a4a722bd21a684a9fe13e05fe5
+SHA1 (patch-support_shobj-conf) = f5d484920243588bfa4f869add2534e99aae9595

Index: pkgsrc/shells/bash/patches/patch-support_shobj-conf
diff -u pkgsrc/shells/bash/patches/patch-support_shobj-conf:1.1 pkgsrc/shells/bash/patches/patch-support_shobj-conf:1.2
--- pkgsrc/shells/bash/patches/patch-support_shobj-conf:1.1     Thu Jan 25 10:40:06 2018
+++ pkgsrc/shells/bash/patches/patch-support_shobj-conf Fri Jan 28 20:39:20 2022
@@ -1,8 +1,11 @@
-$NetBSD: patch-support_shobj-conf,v 1.1 2018/01/25 10:40:06 jperkin Exp $
+$NetBSD: patch-support_shobj-conf,v 1.2 2022/01/28 20:39:20 schmonz Exp $
 
 Spell -fPIC correctly.
+Omit the special -arch_only treatment for old Darwin; it's not supported
+by external compilers (e.g., lang/gcc10) and it's not needed by the
+native compiler (at least, not on Snow Leopard gcc 4.2.1).
 
---- support/shobj-conf.orig    2014-02-24 02:06:29.000000000 +0000
+--- support/shobj-conf.orig    2019-12-13 14:51:17.000000000 +0000
 +++ support/shobj-conf
 @@ -114,7 +114,7 @@ sunos5*-*gcc*|solaris2*-*gcc*)
        ;;
@@ -13,3 +16,12 @@ Spell -fPIC correctly.
        SHOBJ_LD=/usr/ccs/bin/ld
        SHOBJ_LDFLAGS='-G -dy -z text -i -h $@'
  
+@@ -157,7 +157,7 @@ darwin*)
+       *)
+               case "${host_os}" in
+               darwin[89]*|darwin1[012]*)
+-                      SHOBJ_ARCHFLAGS='-arch_only `/usr/bin/arch`'
++                      SHOBJ_ARCHFLAGS=
+                       ;;
+                *)     # Mac OS X 10.9 (Mavericks) and later
+                       SHOBJ_ARCHFLAGS=