Attachment 23395 Details for Bug 40271 – file.diff

[patch] file.diff

file.diff (text/plain), 3.96 KB, created by dmmiller on 2002-07-06 18:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: dmmiller

Created: 2002-07-06 18:40:01 UTC

Size: 3.96 KB

patch

obsolete

>diff -urN /usr/ports/x11/XFree86-4-libraries/Makefile /usr/ports/x11/XFree86-4-libraries.mod/Makefile
>--- /usr/ports/x11/XFree86-4-libraries/Makefile	Tue Mar 19 19:33:47 2002
>+++ /usr/ports/x11/XFree86-4-libraries.mod/Makefile	Sat Jul  6 04:32:58 2002
>@@ -46,7 +46,8 @@
> 			BuildXIE=${BuildXIE} \
> 			BuildAoutLibraries=${BuildAoutLibraries} \
> 			ForceNormalLib=${ForceNormalLib} \
>-			DebuggableLibraries=${DebuggableLibraries}
>+			DebuggableLibraries=${DebuggableLibraries} \
>+			OPTFLAGS="${CFLAGS}"
> MAKE_ENV=		PKGNAMEPREFIX=${PKGNAMEPREFIX} \
> 			PORTNAME=${PORTNAME} \
> 			PORTVERSION=${PORTVERSION}
>diff -urN /usr/ports/x11/XFree86-4-libraries/files/patch-c /usr/ports/x11/XFree86-4-libraries.mod/files/patch-c
>--- /usr/ports/x11/XFree86-4-libraries/files/patch-c	Tue Jun 12 10:59:51 2001
>+++ /usr/ports/x11/XFree86-4-libraries.mod/files/patch-c	Wed Dec 31 19:00:00 1969
>@@ -1,20 +0,0 @@
>---- 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
>diff -urN /usr/ports/x11/XFree86-4-libraries/files/patch-c2 /usr/ports/x11/XFree86-4-libraries.mod/files/patch-c2
>--- /usr/ports/x11/XFree86-4-libraries/files/patch-c2	Sat Mar 16 18:40:17 2002
>+++ /usr/ports/x11/XFree86-4-libraries.mod/files/patch-c2	Wed Dec 31 19:00:00 1969
>@@ -1,20 +0,0 @@
>---- /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
>diff -urN /usr/ports/x11/XFree86-4-libraries/scripts/configure /usr/ports/x11/XFree86-4-libraries.mod/scripts/configure
>--- /usr/ports/x11/XFree86-4-libraries/scripts/configure	Sat Mar 16 18:40:18 2002
>+++ /usr/ports/x11/XFree86-4-libraries.mod/scripts/configure	Sat Jul  6 04:32:34 2002
>@@ -72,6 +72,7 @@
>     echo "#define Freetype2Dir ${LOCALBASE}" >> $LOCALDEF
>     echo "#define FreeBSDBuildXlib  YES" >> $LOCALDEF
>     echo "#define FreeBSDBuildXbin   NO" >> $LOCALDEF
>+    echo "#define OptimizedCDebugFlags ${OPTFLAGS}" >> $LOCALDEF
> 
>     HasXdmAuth=YES

Actions: View | Diff

Attachments on bug 40271: 23395