CVS commit: xsrc/external/mit/xorg-cf-files/dist
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)
CVS commit: xsrc/external/mit/xorg-cf-files/dist
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.
re: CVS commit: xsrc/external/mit/xorg-cf-files/dist
> In interest of reducing the diff to upstream I would suggest to use > their fix and if that is not sufficient we should talk to them. > > https://gitlab.freedesktop.org/xorg/util/cf/-/commit/90b66dc73deb9ef303690370395cf831425547c7 thanks, that's a better idea and more what i was hoping someone would do... unfortunately, it's incomplete in the same way that uwe@ originally mentioned.. just a few lines further down: --- #if HasLargeTmp || SystemV4 #define ArAddCmd ArCmdBase ru #else #define ArAddCmd ArCmdBase rul #endif #endif #ifndef ArExtCmd #if HasLargeTmp || SystemV4 #define ArExtCmd ArCmdBase x #else #define ArExtCmd ArCmdBase xl #endif #endif --- ie, these also need the new "|| HasGnuAr" added too. i guess both of these aren't used in modern code ;) .mrg.
Re: CVS commit: xsrc/external/mit/xorg-cf-files/dist
On Tue, 17 Jan 2023 17:37:01 +0300 Valery Ushakov wrote: > On Tue, Jan 17, 2023 at 05:37:05 +, matthew green wrote: > > > Module Name:xsrc > > Committed By: mrg > > Date: Tue Jan 17 05:37:05 UTC 2023 > > > > Modified Files: > > xsrc/external/mit/xorg-cf-files/dist: Imake.tmpl > > > > Log Message: > > pull over fix from pkgsrc xorg-cf-files and avoid ar's "l" flag. > > That doesn't seem to handle all the cases where "l" flag is used > (ArAddCmd, ArExtCmd). > > Might be easier to either define HasLargeTmp which seems to be *the* > knob to control "l" flag to ar to begin with, or to factor out the > test for "supports l flag" so that the unwieldy > > SystemV4 || LinuxBinUtilsMajorVersion || defined(NetBSDArchitecture) > > is not repeated multiple times. In interest of reducing the diff to upstream I would suggest to use their fix and if that is not sufficient we should talk to them. https://gitlab.freedesktop.org/xorg/util/cf/-/commit/90b66dc73deb9ef303690370395cf831425547c7
Re: CVS commit: xsrc/external/mit/xorg-cf-files/dist
On Tue, Jan 17, 2023 at 05:37:05 +, matthew green wrote: > Module Name: xsrc > Committed By: mrg > Date: Tue Jan 17 05:37:05 UTC 2023 > > Modified Files: > xsrc/external/mit/xorg-cf-files/dist: Imake.tmpl > > Log Message: > pull over fix from pkgsrc xorg-cf-files and avoid ar's "l" flag. That doesn't seem to handle all the cases where "l" flag is used (ArAddCmd, ArExtCmd). Might be easier to either define HasLargeTmp which seems to be *the* knob to control "l" flag to ar to begin with, or to factor out the test for "supports l flag" so that the unwieldy SystemV4 || LinuxBinUtilsMajorVersion || defined(NetBSDArchitecture) is not repeated multiple times. -uwe
CVS commit: xsrc/external/mit/xorg-cf-files/dist
Module Name:xsrc Committed By: mrg Date: Tue Jan 17 05:37:05 UTC 2023 Modified Files: xsrc/external/mit/xorg-cf-files/dist: Imake.tmpl Log Message: pull over fix from pkgsrc xorg-cf-files and avoid ar's "l" flag. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xorg-cf-files/dist
Module Name:xsrc Committed By: mrg Date: Tue Jan 17 05:37:05 UTC 2023 Modified Files: xsrc/external/mit/xorg-cf-files/dist: Imake.tmpl Log Message: pull over fix from pkgsrc xorg-cf-files and avoid ar's "l" flag. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl 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/Imake.tmpl diff -u xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl:1.1.1.4 xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl:1.2 --- xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl:1.1.1.4 Mon Aug 23 22:21:45 2021 +++ xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl Tue Jan 17 05:37:05 2023 @@ -1078,7 +1078,7 @@ TCLIBDIR = TclLibDir #define ArCmdBase ar #endif #ifndef ArCmd -#if HasLargeTmp || SystemV4 || LinuxBinUtilsMajorVersion +#if HasLargeTmp || SystemV4 || LinuxBinUtilsMajorVersion || defined(NetBSDArchitecture) #define ArCmd ArCmdBase cq #else #define ArCmd ArCmdBase clq
CVS commit: xsrc/external/mit/xorg-cf-files/dist
Module Name:xsrc Committed By: mrg Date: Mon Aug 23 22:23:03 UTC 2021 Modified Files: xsrc/external/mit/xorg-cf-files/dist: site.def Log Message: keep ProjectRoot at the old default of /usr/X11R7. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/xorg-cf-files/dist/site.def 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/site.def diff -u xsrc/external/mit/xorg-cf-files/dist/site.def:1.1.1.4 xsrc/external/mit/xorg-cf-files/dist/site.def:1.2 --- xsrc/external/mit/xorg-cf-files/dist/site.def:1.1.1.4 Mon Aug 23 22:21:45 2021 +++ xsrc/external/mit/xorg-cf-files/dist/site.def Mon Aug 23 22:23:03 2021 @@ -72,7 +72,7 @@ XCOMM site: $XFree86: xc/config/cf/site #ifdef AfterVendorCF #ifndef ProjectRoot -#define ProjectRoot /usr/local +#define ProjectRoot /usr/X11R7 #endif #ifndef FontDir
CVS commit: xsrc/external/mit/xorg-cf-files/dist
Module Name:xsrc Committed By: mrg Date: Mon Aug 23 22:23:03 UTC 2021 Modified Files: xsrc/external/mit/xorg-cf-files/dist: site.def Log Message: keep ProjectRoot at the old default of /usr/X11R7. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/xorg-cf-files/dist/site.def Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: xsrc/external/mit/xorg-cf-files/dist
On Thu, Jan 05, 2012 at 02:27:36PM -0500, Christos Zoulas wrote: Module Name: xsrc Committed By:christos Date:Thu Jan 5 19:27:36 UTC 2012 Modified Files: xsrc/external/mit/xorg-cf-files/dist: NetBSD.cf Log Message: Do as the comment says: always include xorg.cf Heads up: the broken version of this (between Jan 2 and Jan 5) silently produces a broken x11-links package that causes all manner of bizarre and inexplicable behavior. So, if you got the broken version, be sure to rebuild x11-links after updating. -- David A. Holland dholl...@netbsd.org
