diff options
author | Michael Lauer <mickey@vanille-media.de> | 2006-05-13 19:17:24 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-13 19:17:24 +0000 |
commit | 94bb836c42bb122b140d7fc0ad0a5775a064ce9a (patch) | |
tree | d0901f122f47da6abe416cedd31376740e6a1efa /packages/xqt2/files/cross.patch | |
parent | 348f2ded2310934f32774fce605625e2976a2d5e (diff) | |
parent | 95e7c0ab24272bde3c1c5d4b89f53ecd8c402125 (diff) |
merge of 30eebf6ff01f422b7202f44394c4cd74a659e235
and aaa38d713385c71e081266891f9d3775789db3a1
Diffstat (limited to 'packages/xqt2/files/cross.patch')
-rw-r--r-- | packages/xqt2/files/cross.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/packages/xqt2/files/cross.patch b/packages/xqt2/files/cross.patch new file mode 100644 index 0000000000..c00068aa26 --- /dev/null +++ b/packages/xqt2/files/cross.patch @@ -0,0 +1,62 @@ +diff -ur xc.org/config/cf/X11.tmpl xc/config/cf/X11.tmpl +--- xc.org/config/cf/X11.tmpl 2003-02-26 06:57:52.000000000 +0900 ++++ xc/config/cf/X11.tmpl 2004-09-16 19:19:46.000000000 +0900 +@@ -1582,9 +1582,9 @@ + MKFONTDIR = $(CLIENTENVSETUP) $(PRELOADFONTSETUP) $(XBUILDBINDIR)/mkfontdir + XCURSORGEN = $(CLIENTENVSETUP) $(PRELOADSETUP) $(XBUILDBINDIR)/xcursorgen + # elif UseInstalledOnCrossCompile +- MKFONTDIR = $(BINDIR)/mkfontdir +- FONTC = $(BINDIR)/bdftopcf +- XCURSORGEN = $(BINDIR)/xcursorgen ++ MKFONTDIR = /usr/X11R6/bin/mkfontdir ++ FONTC = /usr/X11R6/bin/bdftopcf ++ XCURSORGEN = /usr/X11R6/bin/xcursorgen + # endif + # if HasPerl + MKHTMLINDEX = RunPerlScript($(CONFIGSRC)/util/mkhtmlindex.pl,) +diff -ur xc.org/config/cf/cross.def xc/config/cf/cross.def +--- xc.org/config/cf/cross.def 2002-04-04 23:05:33.000000000 +0900 ++++ xc/config/cf/cross.def 2004-09-16 19:19:46.000000000 +0900 +@@ -5,7 +5,7 @@ + * compiler images. It will have to be edited to reflect these + * given your local configuration. + */ +-#if 0 ++#if 1 + #undef i386Architecture + #define Arm32Architecture + +@@ -14,18 +14,18 @@ + #define ServerCDebugFlags -O2 + #undef StandardDefines + #define StandardDefines -Dlinux -D__arm__ -D_POSIX_SOURCE \ +- -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE ++ -D_BSD_SOURCE -D_GNU_SOURCE + #undef CcCmd +-#define StdIncDir /skiff/local/arm-linux/include ++#define StdIncDir $(TOPDIR)/tmp/cross/arm-linux/include + #define PreIncDir + #undef PostIncDir +-#define PostIncDir /skiff/local/lib/gcc-lib/arm-linux/2.95.2/include +-#define CcCmd /skiff/local/bin/arm-linux-gcc ++#define PostIncDir $(TOPDIR)/tmp/cross/lib/gcc-lib/arm-linux/2.95.2/include ++#define CcCmd $(TOPDIR)/tmp/cross/bin/arm-linux-gcc + #undef CplusplusCmd + #define HasCplusplus YES +-#define CplusplusCmd /skiff/local/bin/arm-linux-g++ ++#define CplusplusCmd $(TOPDIR)/tmp/cross/bin/arm-linux-g++ + #define DoRanlibCmd YES +-#define RanlibCmd /skiff/local/bin/arm-linux-ranlib ++#define RanlibCmd $(TOPDIR)/tmp/cross/bin/arm-linux-ranlib + #undef ExtraLoadFlags + #define ExtraLoadFlags + #define FbNoPixelAddrCode +@@ -33,7 +33,7 @@ + #define TermcapLibrary -ltermcap + + #undef LdPostLib +-#define LdPostLib -L/skiff/local/arm-linux/lib ++#define LdPostLib -L$(TOPDIR)/tmp/cross/arm-linux/lib + + #undef ExtensionOSDefines + #define ExtensionOSDefines |