Attachment #23395 for bug #40271

View | Details | Raw Unified | Return to bug 40271
Collapse All | Expand All

Lines 46-52 Link Here

(-)/usr/ports/x11/XFree86-4-libraries.mod/Makefile (-1 / +2 lines)
46	BuildXIE=${BuildXIE} \	46	BuildXIE=${BuildXIE} \
47	BuildAoutLibraries=${BuildAoutLibraries} \	47	BuildAoutLibraries=${BuildAoutLibraries} \
48	ForceNormalLib=${ForceNormalLib} \	48	ForceNormalLib=${ForceNormalLib} \
49	DebuggableLibraries=${DebuggableLibraries}	49	DebuggableLibraries=${DebuggableLibraries} \
		50	OPTFLAGS="${CFLAGS}"
50	MAKE_ENV= PKGNAMEPREFIX=${PKGNAMEPREFIX} \	51	MAKE_ENV= PKGNAMEPREFIX=${PKGNAMEPREFIX} \
51	PORTNAME=${PORTNAME} \	52	PORTNAME=${PORTNAME} \
52	PORTVERSION=${PORTVERSION}	53	PORTVERSION=${PORTVERSION}




--- config/cf/Imake.tmpl.orig	Fri Apr 27 06:09:38 2001
+++ config/cf/Imake.tmpl	Mon Jun  4 19:29:44 2001
@@ -1487,7 +1487,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
@@ -1682,7 +1682,7 @@
  */
       ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_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
         LDPOSTLIB = LdPostLib




--- /usr/local/src/XFree86-4/ORIG/xc/config/cf/Library.tmpl	Tue Dec  5 11:59:31 2000
+++ config/cf/Library.tmpl	Tue Dec 19 17:18:56 2000
@@ -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

Lines 72-77 Link Here

(-)/usr/ports/x11/XFree86-4-libraries.mod/scripts/configure (+1 lines)
72	echo "#define Freetype2Dir ${LOCALBASE}" >> $LOCALDEF	72	echo "#define Freetype2Dir ${LOCALBASE}" >> $LOCALDEF
73	echo "#define FreeBSDBuildXlib YES" >> $LOCALDEF	73	echo "#define FreeBSDBuildXlib YES" >> $LOCALDEF
74	echo "#define FreeBSDBuildXbin NO" >> $LOCALDEF	74	echo "#define FreeBSDBuildXbin NO" >> $LOCALDEF
		75	echo "#define OptimizedCDebugFlags ${OPTFLAGS}" >> $LOCALDEF
75		76
76	HasXdmAuth=YES	77	HasXdmAuth=YES

Return to bug 40271

Lines 1-20 Link Here

(-)/usr/ports/x11/XFree86-4-libraries.mod/files/patch-c (-20 lines)
1	--- config/cf/Imake.tmpl.orig Fri Apr 27 06:09:38 2001
2	+++ config/cf/Imake.tmpl Mon Jun 4 19:29:44 2001
3	@@ -1487,7 +1487,7 @@
4	CXXOPTIONS = CplusplusOptions
5	CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
6	CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)
7	- CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
8	+ CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
9	#endif
10	COMPRESS = CompressCmd
11	GZIPCMD = GzipCmd
12	@@ -1682,7 +1682,7 @@
13	*/
14	ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
15	ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
16	- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
17	+ CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
18	LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
19	LDPRELIB = LdPreLib
20	LDPOSTLIB = LdPostLib

Lines 1-20 Link Here

(-)/usr/ports/x11/XFree86-4-libraries.mod/files/patch-c2 (-20 lines)
1	--- /usr/local/src/XFree86-4/ORIG/xc/config/cf/Library.tmpl Tue Dec 5 11:59:31 2000
2	+++ config/cf/Library.tmpl Tue Dec 19 17:18:56 2000
3	@@ -67,7 +67,7 @@
4	STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
5	CDEBUGFLAGS = LibraryCDebugFlags
6	CLIBDEBUGFLAGS = LibraryDebugOpt
7	- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
8	+ CFLAGS += $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
9	# if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
10	PICFLAGS = LargePositionIndependentCFlags
11	# endif
12	@@ -92,7 +92,7 @@
13	STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
14	CXXDEBUGFLAGS = LibraryCplusplusDebugFlags
15	CXXLIBDEBUGFLAGS = LibraryDebugOpt
16	- CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXLIBDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
17	+ CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXLIBDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
18	# if defined(LargePICTable) && LargePICTable
19	# ifdef LargePositionIndependentCplusplusFlags
20	CXXPICFLAGS = LargePositionIndependentCplusplusFlags