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 /devel | |
| 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 'devel')
| -rw-r--r-- | devel/imake-4/files/patch-c | 5 | ||||
| -rw-r--r-- | devel/imake-4/files/patch-i | 11 | ||||
| -rw-r--r-- | devel/imake-4/scripts/configure | 14 |
3 files changed, 27 insertions, 3 deletions
diff --git a/devel/imake-4/files/patch-c b/devel/imake-4/files/patch-c index 7c9208e18a55..22623f1c32cf 100644 --- a/devel/imake-4/files/patch-c +++ b/devel/imake-4/files/patch-c @@ -1,5 +1,5 @@ --- cf/Imake.tmpl.orig Tue Jun 27 09:55:44 2000 -+++ cf/Imake.tmpl Sun Jul 16 18:19:54 2000 ++++ cf/Imake.tmpl Wed Sep 6 13:31:04 2000 @@ -1385,7 +1385,7 @@ CXXOPTIONS = CplusplusOptions CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) @@ -9,11 +9,12 @@ #endif COMPRESS = CompressCmd GZIPCMD = GzipCmd -@@ -1574,7 +1574,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/devel/imake-4/files/patch-i b/devel/imake-4/files/patch-i new file mode 100644 index 000000000000..9234130815ef --- /dev/null +++ b/devel/imake-4/files/patch-i @@ -0,0 +1,11 @@ +--- cf/Library.tmpl~ Wed Oct 13 13:20:41 1999 ++++ cf/Library.tmpl Wed Sep 6 13:32:03 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 diff --git a/devel/imake-4/scripts/configure b/devel/imake-4/scripts/configure index 05d5ae47329d..e48165c1e9e2 100644 --- a/devel/imake-4/scripts/configure +++ b/devel/imake-4/scripts/configure @@ -26,11 +26,23 @@ if [ X${BuildXIE} != "X" ]; then fi cat >> $F <<EOF +#ifndef XF86CardDrivers +#ifdef i386Architecture #define XF86CardDrivers mga glint nv tga s3virge sis rendition \ neomagic i740 tdfx \ cirrus tseng trident chips apm \ GlideDriver fbdev \ - ati r128 vga XF86ExtraCardDrivers + ati r128 AgpGartDrivers cyrix \ + vga XF86OSCardDrivers XF86ExtraCardDrivers +#else +#define XF86CardDrivers mga glint nv tga s3virge sis rendition \ + neomagic i740 tdfx \ + cirrus tseng trident chips apm \ + GlideDriver fbdev \ + ati r128 cyrix \ + vga XF86OSCardDrivers XF86ExtraCardDrivers +#endif +#endif EOF echo "#define XInputDrivers mouse dynapro elo2300 elographics magellan \ microtouch mutouch spaceorb wacom" >> $F |