diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
| commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
| tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /xfonts/imake-staging.patch | |
| parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) | |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'xfonts/imake-staging.patch')
| -rw-r--r-- | xfonts/imake-staging.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/xfonts/imake-staging.patch b/xfonts/imake-staging.patch deleted file mode 100644 index bf2e350830..0000000000 --- a/xfonts/imake-staging.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- xc/config/cf/Imake.tmpl.orig 2004-07-28 04:24:29.000000000 +0100 -+++ xc/config/cf/Imake.tmpl 2004-09-14 21:03:06.000000000 +0100 -@@ -2038,11 +2038,11 @@ - */ - 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) $(CC_STAGING) - LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) - LDPRELIB = LdPreLib $(INSTALLED_LIBS) - LDPOSTLIB = LdPostLib -- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) -+ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) $(LD_STAGING) - CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) - - LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) ---- xc/config/cf/Library.tmpl~ 2004-05-24 20:06:57.000000000 +0100 -+++ xc/config/cf/Library.tmpl 2004-09-14 21:10:29.000000000 +0100 -@@ -114,7 +114,7 @@ - STD_DEFINES = LibraryDefines $(PROJECT_DEFINES) - CDEBUGFLAGS = LibraryCDebugFlags - CLIBDEBUGFLAGS = LibraryDebugOpt -- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) -+ CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) $(CC_STAGING) - # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags) - PICFLAGS = LargePositionIndependentCFlags - # endif ---- xc/config/cf/X11.tmpl~ 2004-09-03 17:18:18.000000000 +0100 -+++ xc/config/cf/X11.tmpl 2004-09-14 21:30:30.000000000 +0100 -@@ -3359,7 +3359,7 @@ - FREETYPE2LIBDIR = Freetype2LibDir - FREETYPE2INCDIR = Freetype2IncDir - #if Freetype2LibDirStandard --FREETYPE2LIB = -lfreetype -+FREETYPE2LIB = $(LD_STAGING) -lfreetype - #else - FREETYPE2LIB = -L$(FREETYPE2LIBDIR) LinkerRuntimeLibraryPathFlag($(FREETYPE2LIBDIR)) -lfreetype - #endif |