diff options
| author |   Sven 'sleipnir' Rebhan <odinshorse@googlemail.com> | 2009-03-27 07:11:38 +0000 |
|---|---|---|
| committer | Sven 'sleipnir' Rebhan <odinshorse@googlemail.com> | 2009-03-27 07:11:38 +0000 |
| commit | 5922b80e7a5b63ba33e1ad0776daa40b25c560b1 (patch) | |
| tree | 46cdfc6b270e7fd1b4739bc4aaf2751e47c2ca7b /x11-libs | |
| parent | Sync libXt to upstream commited patch. (diff) | |
| download | embedded-cross-5922b80e7a5b63ba33e1ad0776daa40b25c560b1.tar.gz embedded-cross-5922b80e7a5b63ba33e1ad0776daa40b25c560b1.tar.bz2 embedded-cross-5922b80e7a5b63ba33e1ad0776daa40b25c560b1.zip | |
Sync to upstream commited patch.
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/libX11/Manifest | 4 | ||||
| -rw-r--r-- | x11-libs/libX11/files/libX11-1.1.5-crosscompile-makekeys.patch | 62 | ||||
| -rw-r--r-- | x11-libs/libX11/libX11-1.1.5.ebuild | 1 |
3 files changed, 65 insertions, 2 deletions
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest index cc7083b..45ba490 100644 --- a/x11-libs/libX11/Manifest +++ b/x11-libs/libX11/Manifest @@ -1,7 +1,7 @@ AUX libX11-1.1.3-crosscompile-makekeys.patch 1884 RMD160 73c0c5a6a48cc98f50ac6bb35c098f5594150a08 SHA1 a3b2ec48cdfb1a1c021528a41ed7e7241ad623f0 SHA256 e116bf288bf780c1d81aacb20845613c1bb5de13509e912b0b8d219acf36b737 AUX libX11-1.1.3-xcb-locking.patch 966 RMD160 59f9bc11591454bea86e30574866d070dafcd3fb SHA1 3a0838317ba656aec70732353fccc38e26d466b6 SHA256 944357ec53cb862f7b4b7dfe16f876adfa5a1f5ad35bdd0f74d11ae7dc3ecab2 +AUX libX11-1.1.5-crosscompile-makekeys.patch 1765 RMD160 4db118b3792d2a72c98f893a9d319791f574a272 SHA1 a78a6434a3b9ebf83901af435b5ef6b852903029 SHA256 40499aa232be2355ab1a9215e07541a9c67c974f325613b46cd767eb7d853dda DIST libX11-1.1.3.tar.bz2 1526958 RMD160 fcb8d5d31befa0ae227210dc7274c17b30c37fad SHA1 235f69172b262f874d2a2d7bd17e8197aea5b767 SHA256 4a2f566e2ea5dd955c875cb8fa9c18dd725324fc5cf4e23c803442e31ab8917a DIST libX11-1.1.5.tar.bz2 1585005 RMD160 78567a999640851e7daba1ab44603ec099d0b619 SHA1 b703cb7c97e5aa35bf04a8df798e128ae16cf0d0 SHA256 da9272900e41615e9c5dc25d84730b8966da6f5c8f4c40418dca2ad040fc8b82 EBUILD libX11-1.1.3-r1.ebuild 1534 RMD160 7525d37a8d187ee287b6f8f711e26da5a4094656 SHA1 29a039230f61d113ddd004f80a5514fbfdb7c2fd SHA256 980975d8013f1628e16faeb62d698dfbd7d2d4f3a12ffe1282391e434b9bf4f0 -EBUILD libX11-1.1.5.ebuild 1183 RMD160 6f4e6a17bad0caf6dafb69bfc9b1f682ec592da1 SHA1 e15517c6d743ea1928ea7d5ae0e4c91c5fbe99fb SHA256 96767782c446ee8e912e42b6b207fcebf7c8e88c943b2d9681be54e715b4b13a -MISC libX11-1.1.5.ebuild~ 1190 RMD160 46fc84272743ca2414c21e21a1914ab950fbcd18 SHA1 9a3c157346b6b764d28cb2205102602f386b9b9f SHA256 a846aa1be71d1469ec218977b764a5f9fd8af223fa599068f2502947471846cb +EBUILD libX11-1.1.5.ebuild 1238 RMD160 f70243cbcb9dc1731f0a0056c687cb0243a88a3b SHA1 e618d012114a2a28eee24e7d4b260a3d562e0a5e SHA256 c0733b78332eb554c97db2ec68fe8e6ac10c3596ded2065934805ec43850d1f3 diff --git a/x11-libs/libX11/files/libX11-1.1.5-crosscompile-makekeys.patch b/x11-libs/libX11/files/libX11-1.1.5-crosscompile-makekeys.patch new file mode 100644 index 0000000..c14d9f2 --- /dev/null +++ b/x11-libs/libX11/files/libX11-1.1.5-crosscompile-makekeys.patch @@ -0,0 +1,62 @@ +--- configure.ac 2009-03-26 21:33:12.000000000 +0000 ++++ configure.ac.new 2009-03-26 21:33:06.000000000 +0000 +@@ -305,6 +305,17 @@ + fi + AC_SUBST(XKBPROTO_REQUIRES) + ++AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ]) ++ ++AC_MSG_CHECKING([for CC_FOR_BUILD]) ++if test x$host != x$build ; then ++ CC_FOR_BUILD=${CC_FOR_BUILD-gcc} ++else ++ CC_FOR_BUILD=${CC} ++fi ++AC_MSG_RESULT([$CC_FOR_BUILD]) ++AC_SUBST(CC_FOR_BUILD) ++ + AC_FUNC_MMAP() + composecache_default=$ac_cv_func_mmap_fixed_mapped + AC_CHECK_FUNC(nl_langinfo, , [composecache_default=no]) + +--- src/Makefile.am 2009-03-26 21:33:18.000000000 +0000 ++++ src/Makefile.am.new 2009-03-26 21:32:56.000000000 +0000 +@@ -421,8 +421,14 @@ + + KEYSYMDEF=@KEYSYMDEF@ + ++if CROSS_COMPILING ++MAKEKEYS=$(top_builddir)/src/util/xmakekeys ++else ++MAKEKEYS=$(top_builddir)/src/util/makekeys ++endif ++ + ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT) +- $(top_builddir)/src/util/makekeys < $(KEYSYMDEF) > ks_tables_h ++ $(MAKEKEYS) < $(KEYSYMDEF) > ks_tables_h + mv ks_tables_h $@ + + $(top_builddir)/src/util/makekeys$(EXEEXT): force + +--- src/util/Makefile.am 2009-03-26 21:33:26.000000000 +0000 ++++ src/util/Makefile.am.new 2009-03-26 21:32:47.000000000 +0000 +@@ -1,11 +1,16 @@ + # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $ + +-noinst_PROGRAMS=makekeys ++noinst_PROGRAMS=makekeys$(EXEEXT) $(MAKEKEYS_PROG) + + makekeys_CFLAGS=$(X11_CFLAGS) + +-#override CC = gcc +-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++if CROSS_COMPILING ++MAKEKEYS_PROG=xmakekeys$(EXEEXT) ++ ++xmakekeys$(EXEEXT): makekeys.c ++ $(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \ ++ $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makekeys.c ++endif + + EXTRA_DIST = mkks.sh + diff --git a/x11-libs/libX11/libX11-1.1.5.ebuild b/x11-libs/libX11/libX11-1.1.5.ebuild index 84b5521..c02f7c5 100644 --- a/x11-libs/libX11/libX11-1.1.5.ebuild +++ b/x11-libs/libX11/libX11-1.1.5.ebuild @@ -4,6 +4,7 @@ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" +PATCHES="${FILESDIR}/${P}-crosscompile-makekeys.patch" inherit x-modular toolchain-funcs flag-o-matic |