diff options
| author | schmonz <schmonz@pkgsrc.org> | 2022-01-28 20:39:20 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2022-01-28 20:39:20 +0000 |
| commit | c1d33e8b5e2fd4ca444ac34f9334765decc4291b (patch) | |
| tree | 23f39c1e22785b373a2791afa32c7aa54023c47d | |
| parent | d797706925efd47701e5be34ca8210c817b5cea5 (diff) | |
| download | pkgsrc-c1d33e8b5e2fd4ca444ac34f9334765decc4291b.tar.gz | |
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).
| -rw-r--r-- | shells/bash/distinfo | 4 | ||||
| -rw-r--r-- | shells/bash/patches/patch-support_shobj-conf | 16 |
2 files changed, 16 insertions, 4 deletions
diff --git a/shells/bash/distinfo b/shells/bash/distinfo index a46c2700395..bd48f1e9f15 100644 --- a/shells/bash/distinfo +++ b/shells/bash/distinfo @@ -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) = 1390069344607204eb3abbd6ddeb148ff590c55e 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 diff --git a/shells/bash/patches/patch-support_shobj-conf b/shells/bash/patches/patch-support_shobj-conf index 725c6c8b8fa..5155cee76a5 100644 --- a/shells/bash/patches/patch-support_shobj-conf +++ b/shells/bash/patches/patch-support_shobj-conf @@ -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= |