[xsrc/trunk]: xsrc/external/mit/xorg-cf-files/dist pull over / convert to ups...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/350c98d024cd
branches:  trunk
changeset: 7395:350c98d024cd
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Jan 20 22:47:37 2023 +0000

description:
pull over / convert to upstream fixes for newer binutils

https://gitlab.freedesktop.org/xorg/util/cf/-/commit/90b66dc73deb9ef303690370395cf831425547c7

also apply to a couple of other ArCmd uses.  thanks tnn@ for pointing
me to the above change.

diffstat:

 external/mit/xorg-cf-files/dist/FreeBSD.cf |  3 +++
 external/mit/xorg-cf-files/dist/Imake.tmpl |  6 +++---
 external/mit/xorg-cf-files/dist/NetBSD.cf  |  4 ++++
 external/mit/xorg-cf-files/dist/linux.cf   |  4 ++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diffs (69 lines):

diff -r c48385e8b899 -r 350c98d024cd external/mit/xorg-cf-files/dist/FreeBSD.cf
--- a/external/mit/xorg-cf-files/dist/FreeBSD.cf        Thu Jan 19 06:14:17 2023 +0000
+++ b/external/mit/xorg-cf-files/dist/FreeBSD.cf        Fri Jan 20 22:47:37 2023 +0000
@@ -153,6 +153,9 @@
 #ifndef HasFlex
 #define HasFlex                        YES
 #endif
+#ifndef HasGnuAr
+#define HasGnuAr               YES
+#endif
 
 #ifndef HasMktemp
 #if (OSMajorVersion >= 4) || (OSMajorVersion == 3 && OSMinorVersion >= 1) || \
diff -r c48385e8b899 -r 350c98d024cd external/mit/xorg-cf-files/dist/Imake.tmpl
--- a/external/mit/xorg-cf-files/dist/Imake.tmpl        Thu Jan 19 06:14:17 2023 +0000
+++ b/external/mit/xorg-cf-files/dist/Imake.tmpl        Fri Jan 20 22:47:37 2023 +0000
@@ -1078,21 +1078,21 @@
 #define ArCmdBase ar
 #endif
 #ifndef ArCmd
-#if HasLargeTmp || SystemV4 || LinuxBinUtilsMajorVersion || defined(NetBSDArchitecture)
+#if HasLargeTmp || SystemV4 || HasGnuAr
 #define ArCmd ArCmdBase cq
 #else
 #define ArCmd ArCmdBase clq
 #endif
 #endif
 #ifndef ArAddCmd
-#if HasLargeTmp || SystemV4
+#if HasLargeTmp || SystemV4 || HasGnuAr
 #define ArAddCmd ArCmdBase ru
 #else
 #define ArAddCmd ArCmdBase rul
 #endif
 #endif
 #ifndef ArExtCmd
-#if HasLargeTmp || SystemV4
+#if HasLargeTmp || SystemV4 || HasGnuAr
 #define ArExtCmd ArCmdBase x
 #else
 #define ArExtCmd ArCmdBase xl
diff -r c48385e8b899 -r 350c98d024cd external/mit/xorg-cf-files/dist/NetBSD.cf
--- a/external/mit/xorg-cf-files/dist/NetBSD.cf Thu Jan 19 06:14:17 2023 +0000
+++ b/external/mit/xorg-cf-files/dist/NetBSD.cf Fri Jan 20 22:47:37 2023 +0000
@@ -333,6 +333,10 @@
 
 #define HasFlex                        YES
 
+#ifndef HasGnuAr
+#define HasGnuAr               YES
+#endif
+
 /* NetBSD doesn't have gperf in the base install */
 #define DontRebuildGperfOutput YES
 
diff -r c48385e8b899 -r 350c98d024cd external/mit/xorg-cf-files/dist/linux.cf
--- a/external/mit/xorg-cf-files/dist/linux.cf  Thu Jan 19 06:14:17 2023 +0000
+++ b/external/mit/xorg-cf-files/dist/linux.cf  Fri Jan 20 22:47:37 2023 +0000
@@ -90,6 +90,10 @@
 # define LinuxBinUtilsMajorVersion     DefaultLinuxBinUtilsMajorVersion
 #endif
 
+#ifndef HasGnuAr
+#define HasGnuAr               YES
+#endif
+
 XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
 XCOMM libc:    (LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion)
 XCOMM binutils:        (LinuxBinUtilsMajorVersion)