diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2002-10-17 07:20:03 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2002-10-17 07:20:03 +0000 |
| commit | d0cc39f7c80fc40eff1ee1ce995f125df0596d37 (patch) | |
| tree | 7d8b02db4dea279831887c81f11867296a843496 /x11/XFree86-4-libraries/files/patch-c2 | |
| parent | Damage to the CVS repository has been corrected, so add RDF files (diff) | |
[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
Notes
Notes:
svn path=/head/; revision=68192
Diffstat (limited to 'x11/XFree86-4-libraries/files/patch-c2')
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-c2 | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/x11/XFree86-4-libraries/files/patch-c2 b/x11/XFree86-4-libraries/files/patch-c2 index 810389b5eb75..bbebc76c13e0 100644 --- a/x11/XFree86-4-libraries/files/patch-c2 +++ b/x11/XFree86-4-libraries/files/patch-c2 @@ -1,23 +1,5 @@ --- config/cf/Library.tmpl.orig Mon Aug 27 10:40:55 2001 -+++ config/cf/Library.tmpl Mon Sep 2 12:06:46 2002 -@@ -67,7 +67,7 @@ - STD_DEFINES = LibraryDefines $(PROJECT_DEFINES) - CDEBUGFLAGS = LibraryCDebugFlags - CLIBDEBUGFLAGS = LibraryDebugOpt -- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) -+ CFLAGS += $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) - # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags) - PICFLAGS = LargePositionIndependentCFlags - # endif -@@ -92,7 +92,7 @@ - STD_DEFINES = LibraryDefines $(PROJECT_DEFINES) - CXXDEBUGFLAGS = LibraryCplusplusDebugFlags - CXXLIBDEBUGFLAGS = LibraryDebugOpt -- CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXLIBDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) -+ CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXLIBDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) - # if defined(LargePICTable) && LargePICTable - # ifdef LargePositionIndependentCplusplusFlags - CXXPICFLAGS = LargePositionIndependentCplusplusFlags ++++ config/cf/Library.tmpl Wed Oct 16 21:53:13 2002 @@ -300,6 +300,10 @@ */ |