c90ee83f03
DRI drivers are incompatible with the old libGL in XFree86, they have been repocopied to graphics/xfree86-dri. Also note that with this commit the html manpages are going away, and with it the runtime dependency on perl for the imake port. Release notes at: http://www.x.org/X11R6.8.1/RELNOTES.txt Props to: kris (multiple cluster runs and sorting through logs) lesi (fixing all the issues in those logs, and more)
20 lines
1.2 KiB
Cheetah
20 lines
1.2 KiB
Cheetah
--- cf/Imake.tmpl.orig Tue Jul 27 20:24:29 2004
|
|
+++ cf/Imake.tmpl Fri Sep 10 18:45:12 2004
|
|
@@ -1798,7 +1798,7 @@
|
|
CXXOPTIONS = CplusplusOptions
|
|
CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
|
|
CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)
|
|
- CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
|
|
+ CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
|
|
#endif
|
|
COMPRESS = CompressCmd
|
|
GZIPCMD = GzipCmd
|
|
@@ -2038,7 +2038,7 @@
|
|
*/
|
|
ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
|
|
ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
|
|
- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
|
|
+ CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
|
|
LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
|
|
LDPRELIB = LdPreLib $(INSTALLED_LIBS)
|
|
LDPOSTLIB = LdPostLib
|