diff options
| author | jmz <jmz@FreeBSD.org> | 2000-03-19 00:54:01 +0000 |
|---|---|---|
| committer | jmz <jmz@FreeBSD.org> | 2000-03-19 00:54:01 +0000 |
| commit | e40596a33469b487f27de2169762284dc35c1a2a (patch) | |
| tree | 0cff1dd7f7abdeba8b0ef451f2e579836e53e19e /x11 | |
| parent | a73c8323c74ce6bfb6523a151d2b90abcad44de5 (diff) | |
| download | FreeBSD-ports-e40596a33469b487f27de2169762284dc35c1a2a.zip FreeBSD-ports-e40596a33469b487f27de2169762284dc35c1a2a.tar.gz | |
Fix compilation problems on FreeBSD 5.0-CURRENT
Submitted by: ANAZAWA Akio <anazawa@hic-soft.co.jp>
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-d | 15 | ||||
| -rw-r--r-- | x11/XFree86-4/files/patch-d | 15 |
2 files changed, 26 insertions, 4 deletions
diff --git a/x11/XFree86-4-libraries/files/patch-d b/x11/XFree86-4-libraries/files/patch-d index 11778ab..d890a8b 100644 --- a/x11/XFree86-4-libraries/files/patch-d +++ b/x11/XFree86-4-libraries/files/patch-d @@ -1,5 +1,5 @@ ---- config/cf/FreeBSD.cf~ Tue Feb 22 02:42:26 2000 -+++ config/cf/FreeBSD.cf Tue Feb 22 03:15:08 2000 +--- config/cf/FreeBSD.cf.orig Thu Feb 17 18:09:43 2000 ++++ config/cf/FreeBSD.cf Sat Mar 18 19:42:06 2000 @@ -336,14 +336,14 @@ /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ #ifndef DefaultGcc2i386Opt @@ -17,3 +17,14 @@ #endif #ifndef PreIncDir +@@ -463,8 +463,9 @@ + /* + * A hack to work around an optimisation problem with the compiler on + * FreeBSD 4.0-current in late 1999/early 2000. ++ * (and FreeBSD 5.0-current in early 2000) + */ +-#if OSMajorVersion == 4 && OSMinorVersion == 0 && OSTeenyVersion == 0 ++#if (OSMajorVersion == 4 || OSMajorVersion == 5) && OSMinorVersion == 0 && OSTeenyVersion == 0 + #define FreeBSDGccOptBug + #endif + diff --git a/x11/XFree86-4/files/patch-d b/x11/XFree86-4/files/patch-d index 11778ab..d890a8b 100644 --- a/x11/XFree86-4/files/patch-d +++ b/x11/XFree86-4/files/patch-d @@ -1,5 +1,5 @@ ---- config/cf/FreeBSD.cf~ Tue Feb 22 02:42:26 2000 -+++ config/cf/FreeBSD.cf Tue Feb 22 03:15:08 2000 +--- config/cf/FreeBSD.cf.orig Thu Feb 17 18:09:43 2000 ++++ config/cf/FreeBSD.cf Sat Mar 18 19:42:06 2000 @@ -336,14 +336,14 @@ /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ #ifndef DefaultGcc2i386Opt @@ -17,3 +17,14 @@ #endif #ifndef PreIncDir +@@ -463,8 +463,9 @@ + /* + * A hack to work around an optimisation problem with the compiler on + * FreeBSD 4.0-current in late 1999/early 2000. ++ * (and FreeBSD 5.0-current in early 2000) + */ +-#if OSMajorVersion == 4 && OSMinorVersion == 0 && OSTeenyVersion == 0 ++#if (OSMajorVersion == 4 || OSMajorVersion == 5) && OSMinorVersion == 0 && OSTeenyVersion == 0 + #define FreeBSDGccOptBug + #endif + |
