diff options
author | Chris Larson <kergoth@openedhand.com> | 2006-08-15 11:58:37 +0000 |
---|---|---|
committer | Chris Larson <kergoth@openedhand.com> | 2006-08-15 11:58:37 +0000 |
commit | ca10363baac7de9581ec90ab47957f973e1dbdc4 (patch) | |
tree | 2000b53f806c79510671d8fd1a6a36125f8b25b3 /meta/packages/xserver/xserver-xorg/imake-staging.patch | |
parent | c210d01a7ca8c00ddc45d292878b89086b137129 (diff) | |
download | poky-ca10363baac7de9581ec90ab47957f973e1dbdc4.tar.gz |
Numerous new xorg package versions from upstream OE. Pester me if any local changes got inadvertantly lost, or if any packages need upgrading.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@607 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xserver/xserver-xorg/imake-staging.patch')
-rw-r--r-- | meta/packages/xserver/xserver-xorg/imake-staging.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/meta/packages/xserver/xserver-xorg/imake-staging.patch b/meta/packages/xserver/xserver-xorg/imake-staging.patch deleted file mode 100644 index bf2e350830..0000000000 --- a/meta/packages/xserver/xserver-xorg/imake-staging.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | --- xc/config/cf/Imake.tmpl.orig 2004-07-28 04:24:29.000000000 +0100 | ||
2 | +++ xc/config/cf/Imake.tmpl 2004-09-14 21:03:06.000000000 +0100 | ||
3 | @@ -2038,11 +2038,11 @@ | ||
4 | */ | ||
5 | ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) | ||
6 | ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) | ||
7 | - CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) | ||
8 | + CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING) | ||
9 | LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) | ||
10 | LDPRELIB = LdPreLib $(INSTALLED_LIBS) | ||
11 | LDPOSTLIB = LdPostLib | ||
12 | - LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) | ||
13 | + LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) $(LD_STAGING) | ||
14 | CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) | ||
15 | |||
16 | LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) | ||
17 | --- xc/config/cf/Library.tmpl~ 2004-05-24 20:06:57.000000000 +0100 | ||
18 | +++ xc/config/cf/Library.tmpl 2004-09-14 21:10:29.000000000 +0100 | ||
19 | @@ -114,7 +114,7 @@ | ||
20 | STD_DEFINES = LibraryDefines $(PROJECT_DEFINES) | ||
21 | CDEBUGFLAGS = LibraryCDebugFlags | ||
22 | CLIBDEBUGFLAGS = LibraryDebugOpt | ||
23 | - CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) | ||
24 | + CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) $(CC_STAGING) | ||
25 | # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags) | ||
26 | PICFLAGS = LargePositionIndependentCFlags | ||
27 | # endif | ||
28 | --- xc/config/cf/X11.tmpl~ 2004-09-03 17:18:18.000000000 +0100 | ||
29 | +++ xc/config/cf/X11.tmpl 2004-09-14 21:30:30.000000000 +0100 | ||
30 | @@ -3359,7 +3359,7 @@ | ||
31 | FREETYPE2LIBDIR = Freetype2LibDir | ||
32 | FREETYPE2INCDIR = Freetype2IncDir | ||
33 | #if Freetype2LibDirStandard | ||
34 | -FREETYPE2LIB = -lfreetype | ||
35 | +FREETYPE2LIB = $(LD_STAGING) -lfreetype | ||
36 | #else | ||
37 | FREETYPE2LIB = -L$(FREETYPE2LIBDIR) LinkerRuntimeLibraryPathFlag($(FREETYPE2LIBDIR)) -lfreetype | ||
38 | #endif | ||