cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Both of the below are

Browse Source 
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)
This commit is contained in:
Satoshi Asami 2000-09-07 00:03:49 +00:00
parent 7b09b2f764
commit e9c8b285ce
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=32360
7 changed files with 60 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/imake-4/files/patch-c
View File

@ -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

11
devel/imake-4/files/patch-i Normal file
View File

@ -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

14
devel/imake-4/scripts/configure vendored
View File

@ -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

9
x11-servers/XFree86-4-Server-snap/scripts/configure vendored
View File

@ -59,12 +59,21 @@ configure () {
echo "#define XF86Server YES" >> $LOCALDEF
echo "#define BuildServersOnly YES" >> $LOCALDEF
cat >> $LOCALDEF <<END
#ifdef i386Architecture
#define XF86CardDrivers mga glint nv tga s3virge sis rendition \
neomagic i740 tdfx \
cirrus tseng trident chips apm \
GlideDriver fbdev \
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
END
if [ $ExtendedInputDevices != "YES" ]; then
echo "#define XInputDrivers mouse" >> $LOCALDEF

9
x11-servers/XFree86-4-Server/scripts/configure vendored
View File

@ -59,12 +59,21 @@ configure () {
echo "#define XF86Server YES" >> $LOCALDEF
echo "#define BuildServersOnly YES" >> $LOCALDEF
cat >> $LOCALDEF <<END
#ifdef i386Architecture
#define XF86CardDrivers mga glint nv tga s3virge sis rendition \
neomagic i740 tdfx \
cirrus tseng trident chips apm \
GlideDriver fbdev \
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
END
if [ $ExtendedInputDevices != "YES" ]; then
echo "#define XInputDrivers mouse" >> $LOCALDEF

9
x11/XFree86-4-libraries/files/patch-c
View File

@ -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

11
x11/XFree86-4-libraries/files/patch-z03
View File

@ -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