python-pyrex: Rework DEPENDS updates
[openembedded.git] / recipes / xqt / files / imake-staging.patch
blobbf2e35083019f05c2f1d5255889437c2473f847e
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)
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