From d0cc39f7c80fc40eff1ee1ce995f125df0596d37 Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@FreeBSD.org>
Date: Thu, 17 Oct 2002 07:20:03 +0000
Subject: [1] Make the 4.2.1 ports all use the merged 4.2.1+mitshm patch. [2]
 Make the ports respect CFLAGS better.  Now CFLAGS (and CC/CXX) are set for
 the build during the configure stage.

PR:		[2] 40271, 43369
---
 x11/XFree86-4-libraries/files/patch-d | 42 +++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 19 deletions(-)

(limited to 'x11/XFree86-4-libraries/files/patch-d')

diff --git a/x11/XFree86-4-libraries/files/patch-d b/x11/XFree86-4-libraries/files/patch-d
index 0b413d45abd7..6dd191f728b3 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.orig	Sun Oct  6 18:14:59 2002
-+++ config/cf/FreeBSD.cf	Sun Oct  6 18:28:12 2002
+--- config/cf/FreeBSD.cf.orig	Wed Oct 16 20:31:40 2002
++++ config/cf/FreeBSD.cf	Wed Oct 16 20:32:04 2002
 @@ -43,11 +43,15 @@
  #define GccUsesGas		YES
  #define UseGas			YES
@@ -58,13 +58,13 @@
  #if BuildThreadStubLibrary && !UseInstalled
 -# define CcCmd			$(CLIENTENVSETUP) cc
 -# define CplusplusCmd		$(CLIENTENVSETUP) c++
-+# define CcCmd			$(CLIENTENVSETUP) ${FBSDCC}
-+# define CplusplusCmd		$(CLIENTENVSETUP) ${FBSDCXX}
++# define CcCmd			$(CLIENTENVSETUP) FreeBSDCC
++# define CplusplusCmd		$(CLIENTENVSETUP) FreeBSDCXX
  #else
 -# define CcCmd			cc
 -# define CplusplusCmd		c++
-+# define CcCmd			${FBSDCC}
-+# define CplusplusCmd		${FBSDCXX}
++# define CcCmd			FreeBSDCC
++# define CplusplusCmd		FreeBSDCXX
  #endif
  
  #define CppCmd			/usr/bin/cpp
@@ -99,24 +99,28 @@
  
  #define StandardDefines	-DCSRG_BASED
  
-@@ -448,14 +469,14 @@
- /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
- #ifndef DefaultGcc2i386Opt
- #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
--#define DefaultGcc2i386Opt -O2
-+#define DefaultGcc2i386Opt
- #endif
+@@ -445,18 +466,8 @@
+ #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
  #endif
  
- #ifdef i386Architecture
- # define OptimizedCDebugFlags DefaultGcc2i386Opt
- #else
+-/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
+-#ifndef DefaultGcc2i386Opt
+-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
+-#define DefaultGcc2i386Opt -O2
+-#endif
+-#endif
+-
+-#ifdef i386Architecture
+-# define OptimizedCDebugFlags DefaultGcc2i386Opt
+-#else
 -# define OptimizedCDebugFlags -O
-+# define OptimizedCDebugFlags
- #endif
+-#endif
++#define DefaultGcc2i386Opt
++#define OptimizedCDebugFlags FreeBSDCFLAGS
  
  #ifndef PreIncDir
-@@ -509,6 +530,10 @@
+ # define PreIncDir	/usr/include
+@@ -509,6 +520,10 @@
   
  #ifndef PamLibraries
  #define PamLibraries		-lpam DlLibrary
-- 
cgit v1.2.3