|
1
|
|
-commit 90b66dc73deb9ef303690370395cf831425547c7
|
|
2
|
|
-Author: Yasuhiro Kimura <yasu@utahime.org>
|
|
3
|
|
-Date: Thu Oct 13 15:22:02 2022 +0900
|
|
4
|
|
-
|
|
5
|
|
- Fix incompatibility issue of GNU binutils 2.36 and later on FreeBSD.
|
|
6
|
|
-
|
|
7
|
|
- Commit a6d4d6223ef75119d5373fa4cc04161bcdb4e769 fixes incompatibility
|
|
8
|
|
- issue of GNU binutils 2.36 and later. If I check the diff of the
|
|
9
|
|
- commit, there seems to be asumption that the issue is specific to
|
|
10
|
|
- Linux. But it also happens on FreeBSD if user installs GNU binutils
|
|
11
|
|
- from FreeBSD ports/packages collections and '/usr/local/bin' comes
|
|
12
|
|
- before '/usr/bin' in the value of PATH enviroment variable. So fix the
|
|
13
|
|
- issue also on FreeBSD with following way.
|
|
14
|
|
-
|
|
15
|
|
- 1. Introduce new macro 'HasGnuAr'.
|
|
16
|
|
- 2. Change Imake.tmpl so it defines 'ArCmd' as 'ArCmdBase cq' if
|
|
17
|
|
- 'HasGnuAr' is defined.
|
|
18
|
|
- 3. Define 'HasGnuAr' in both FreeBSD.cf and linux.cf.
|
|
19
|
|
-
|
|
20
|
|
- Since 'ar' command of FreeBSD base system simply ignores 'l' option,
|
|
21
|
|
- it also works fine even if GNU binutils isn't installed.
|
|
22
|
|
-
|
|
23
|
1
|
commit 26b383ac4a5b65f808d1a159864fac266f136c84
|
|
24
|
2
|
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
|
|
25
|
3
|
Date: Thu Jul 25 22:48:36 2024 +0200
|
| ... |
... |
@@ -29,48 +7,6 @@ Date: Thu Jul 25 22:48:36 2024 +0200 |
|
29
|
7
|
Just like 90b66dc73deb ("Fix incompatibility issue of GNU binutils 2.36
|
|
30
|
8
|
and later on FreeBSD.") did.
|
|
31
|
9
|
|
|
32
|
|
-Index: xutils-dev-7.7+6.2+hurd.1/xorg-cf-files/FreeBSD.cf
|
|
33
|
|
-===================================================================
|
|
34
|
|
---- xutils-dev-7.7+6.2+hurd.1.orig/xorg-cf-files/FreeBSD.cf
|
|
35
|
|
-+++ xutils-dev-7.7+6.2+hurd.1/xorg-cf-files/FreeBSD.cf
|
|
36
|
|
-@@ -153,6 +153,9 @@ XCOMM operating system: OSName (OSMajor
|
|
37
|
|
- #ifndef HasFlex
|
|
38
|
|
- #define HasFlex YES
|
|
39
|
|
- #endif
|
|
40
|
|
-+#ifndef HasGnuAr
|
|
41
|
|
-+#define HasGnuAr YES
|
|
42
|
|
-+#endif
|
|
43
|
|
-
|
|
44
|
|
- #ifndef HasMktemp
|
|
45
|
|
- #if (OSMajorVersion >= 4) || (OSMajorVersion == 3 && OSMinorVersion >= 1) || \
|
|
46
|
|
-Index: xutils-dev-7.7+6.2+hurd.1/xorg-cf-files/Imake.tmpl
|
|
47
|
|
-===================================================================
|
|
48
|
|
---- xutils-dev-7.7+6.2+hurd.1.orig/xorg-cf-files/Imake.tmpl
|
|
49
|
|
-+++ xutils-dev-7.7+6.2+hurd.1/xorg-cf-files/Imake.tmpl
|
|
50
|
|
-@@ -1140,7 +1140,7 @@ TCLIBDIR = TclLibDir
|
|
51
|
|
- #define ArCmdBase ar
|
|
52
|
|
- #endif
|
|
53
|
|
- #ifndef ArCmd
|
|
54
|
|
--#if HasLargeTmp || SystemV4 || LinuxBinUtilsMajorVersion
|
|
55
|
|
-+#if HasLargeTmp || SystemV4 || HasGnuAr
|
|
56
|
|
- #define ArCmd ArCmdBase cq
|
|
57
|
|
- #else
|
|
58
|
|
- #define ArCmd ArCmdBase clq
|
|
59
|
|
-Index: xutils-dev-7.7+6.2+hurd.1/xorg-cf-files/linux.cf
|
|
60
|
|
-===================================================================
|
|
61
|
|
---- xutils-dev-7.7+6.2+hurd.1.orig/xorg-cf-files/linux.cf
|
|
62
|
|
-+++ xutils-dev-7.7+6.2+hurd.1/xorg-cf-files/linux.cf
|
|
63
|
|
-@@ -103,6 +103,10 @@ XCOMM platform: $XFree86: xc/config/cf/
|
|
64
|
|
- # define LinuxBinUtilsMajorVersion DefaultLinuxBinUtilsMajorVersion
|
|
65
|
|
- #endif
|
|
66
|
|
-
|
|
67
|
|
-+#ifndef HasGnuAr
|
|
68
|
|
-+#define HasGnuAr YES
|
|
69
|
|
-+#endif
|
|
70
|
|
-+
|
|
71
|
|
- XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
|
|
72
|
|
- XCOMM libc: (LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion)
|
|
73
|
|
- XCOMM binutils: (LinuxBinUtilsMajorVersion)
|
|
74
|
10
|
Index: xutils-dev-7.7+6.2+hurd.1/xorg-cf-files/gnu.cf
|
|
75
|
11
|
===================================================================
|
|
76
|
12
|
--- xutils-dev-7.7+6.2+hurd.1.orig/xorg-cf-files/gnu.cf
|