diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 2000-09-07 00:03:49 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 2000-09-07 00:03:49 +0000 |
| commit | e9c8b285ce3dbbd53e0ffc7a61982be72932d8c3 (patch) | |
| tree | 72ee9f36e19c729fb6894fedb2b3505c049b2c00 /x11 | |
| parent | Split rubytk into ruby-tcltklib and ruby-tk. (diff) | |
Both of the below are
Submitted by: maintainer
(1) Respect CFLAGS when compiling shared libraries and servers.
(imake-4, XFree86-4-libraries)
Reported by: asami
(2) Do not redefine list of supported cards, and support architectures
other than i386 better.
(imake-4, XFree86-4-Server)
Notes
Notes:
svn path=/head/; revision=32360
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-c | 9 | ||||
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-z03 | 11 |
2 files changed, 15 insertions, 5 deletions
diff --git a/x11/XFree86-4-libraries/files/patch-c b/x11/XFree86-4-libraries/files/patch-c index 42729fc15e7f..4043a25bd8bc 100644 --- a/x11/XFree86-4-libraries/files/patch-c +++ b/x11/XFree86-4-libraries/files/patch-c @@ -1,6 +1,6 @@ ---- config/cf/Imake.tmpl~ Tue Feb 22 02:42:26 2000 -+++ config/cf/Imake.tmpl Tue Feb 22 03:11:21 2000 -@@ -1282,7 +1282,7 @@ +--- config/cf/Imake.tmpl.orig Tue Jun 27 09:55:44 2000 ++++ config/cf/Imake.tmpl Wed Sep 6 14:22:34 2000 +@@ -1385,7 +1385,7 @@ CXXOPTIONS = CplusplusOptions CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES) @@ -9,11 +9,12 @@ #endif COMPRESS = CompressCmd GZIPCMD = GzipCmd -@@ -1469,7 +1469,7 @@ +@@ -1574,7 +1574,8 @@ */ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES) ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) - CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) ++ SYSCFLAGS := $(CFLAGS) $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) + CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) LDPRELIB = LdPreLib diff --git a/x11/XFree86-4-libraries/files/patch-z03 b/x11/XFree86-4-libraries/files/patch-z03 index cbae345baefc..cec66a9790ca 100644 --- a/x11/XFree86-4-libraries/files/patch-z03 +++ b/x11/XFree86-4-libraries/files/patch-z03 @@ -1,5 +1,14 @@ --- config/cf/Library.tmpl.orig Wed Oct 13 13:20:41 1999 -+++ config/cf/Library.tmpl Wed Jul 19 09:15:07 2000 ++++ config/cf/Library.tmpl Wed Sep 6 14:25:44 2000 +@@ -67,7 +67,7 @@ + STD_DEFINES = LibraryDefines $(PROJECT_DEFINES) + CDEBUGFLAGS = LibraryCDebugFlags + CLIBDEBUGFLAGS = LibraryDebugOpt +- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) ++ CFLAGS = $(SYSCFLAGS) $(CLIBDEBUGFLAGS) + # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags) + PICFLAGS = LargePositionIndependentCFlags + # endif @@ -434,10 +434,14 @@ # ifdef IncSubdir # ifdef IncSubSubdir |