Module Name: xsrc
Committed By: mrg
Date: Fri Jan 20 22:47:37 UTC 2023
Modified Files:
xsrc/external/mit/xorg-cf-files/dist: FreeBSD.cf Imake.tmpl NetBSD.cf
linux.cf
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/xorg-cf-files/dist/FreeBSD.cf
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf
cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/xorg-cf-files/dist/linux.cf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-cf-files/dist/FreeBSD.cf
diff -u xsrc/external/mit/xorg-cf-files/dist/FreeBSD.cf:1.1.1.3 xsrc/external/mit/xorg-cf-files/dist/FreeBSD.cf:1.2
--- xsrc/external/mit/xorg-cf-files/dist/FreeBSD.cf:1.1.1.3 Wed Mar 19 23:43:17 2014
+++ xsrc/external/mit/xorg-cf-files/dist/FreeBSD.cf Fri Jan 20 22:47:37 2023
@@ -153,6 +153,9 @@ XCOMM operating system: OSName (OSMajor
#ifndef HasFlex
#define HasFlex YES
#endif
+#ifndef HasGnuAr
+#define HasGnuAr YES
+#endif
#ifndef HasMktemp
#if (OSMajorVersion >= 4) || (OSMajorVersion == 3 && OSMinorVersion >= 1) || \
Index: xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl
diff -u xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl:1.2 xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl:1.3
--- xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl:1.2 Tue Jan 17 05:37:05 2023
+++ xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl Fri Jan 20 22:47:37 2023
@@ -1078,21 +1078,21 @@ TCLIBDIR = TclLibDir
#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
Index: xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf
diff -u xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf:1.8 xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf:1.9
--- xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf:1.8 Wed Mar 19 23:45:21 2014
+++ xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf Fri Jan 20 22:47:37 2023
@@ -333,6 +333,10 @@ XCOMM operating system: OSName (OSMajor
#define HasFlex YES
+#ifndef HasGnuAr
+#define HasGnuAr YES
+#endif
+
/* NetBSD doesn't have gperf in the base install */
#define DontRebuildGperfOutput YES
Index: xsrc/external/mit/xorg-cf-files/dist/linux.cf
diff -u xsrc/external/mit/xorg-cf-files/dist/linux.cf:1.1.1.5 xsrc/external/mit/xorg-cf-files/dist/linux.cf:1.2
--- xsrc/external/mit/xorg-cf-files/dist/linux.cf:1.1.1.5 Mon Aug 23 22:21:45 2021
+++ xsrc/external/mit/xorg-cf-files/dist/linux.cf Fri Jan 20 22:47:37 2023
@@ -90,6 +90,10 @@ XCOMM platform: $XFree86: xc/config/cf/
# 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)
