diff options
| author |   Sven 'sleipnir' Rebhan <odinshorse@googlemail.com> | 2009-03-27 07:10:10 +0000 |
|---|---|---|
| committer | Sven 'sleipnir' Rebhan <odinshorse@googlemail.com> | 2009-03-27 07:10:10 +0000 |
| commit | 774f16941d1ed25e1736011d3e782a7ba7fc3e6c (patch) | |
| tree | c6ca7681618045f0c755940fb2bfa9dd21eda3d9 /x11-libs | |
| parent | Sync to the patch submitted to Gentoo's bugzilla. (diff) | |
| download | embedded-cross-774f16941d1ed25e1736011d3e782a7ba7fc3e6c.tar.gz embedded-cross-774f16941d1ed25e1736011d3e782a7ba7fc3e6c.tar.bz2 embedded-cross-774f16941d1ed25e1736011d3e782a7ba7fc3e6c.zip | |
Sync libXt to upstream commited patch.
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/libXt/Manifest | 3 | ||||
| -rw-r--r-- | x11-libs/libXt/files/libXt-1.0.5-crosscompile-makestr.patch | 79 | ||||
| -rw-r--r-- | x11-libs/libXt/libXt-1.0.5.ebuild | 19 |
3 files changed, 82 insertions, 19 deletions
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest index bfdeab9..17c5463 100644 --- a/x11-libs/libXt/Manifest +++ b/x11-libs/libXt/Manifest @@ -1,4 +1,5 @@ AUX crosscompile-configure.ac.patch 658 RMD160 bb8bcde9d855fab9eb6b9d91158bb829aa36f0c0 SHA1 6728dc1a0e7ec9585cf6aac5d541aab86b8e5054 SHA256 ada6b7c4138b278bfe74f49b88c491aaa83fd02e3eb563890cf2a9915106a347 AUX crosscompile-makestrs.patch 3948 RMD160 c9aff88b260d274ec82cc3f54f33389175c02c03 SHA1 319379b184e7f8919a2ca715828bfc6200d08593 SHA256 282dababc6b9f28a6b852c06f866839b52af03964b8ac37645f1a3ba7bd1aae6 +AUX libXt-1.0.5-crosscompile-makestr.patch 1989 RMD160 315646d6e91d1d4e4e1f435c3b8cd6959e3d9f59 SHA1 162caa703be7e4f7936828f03ddcbf769f629ae9 SHA256 8cdc28d3087bde7b839931bc6ef6bea98551946fe54d7e6eefa0b17d92a7dc91 DIST libXt-1.0.5.tar.bz2 500502 RMD160 7e5ef9e03dc860bf5b64b85a897dd1d2ae1ed0bf SHA1 5f33921e373ce162a39eabef2ce05d946935eb5b SHA256 43c472ada59a04428a463225cd4cd42cb81bc43eb687cc1890f2f1c81a3e9cf4 -EBUILD libXt-1.0.5.ebuild 1166 RMD160 59897e0f30e31cf318a5816bacc42f59c30bca50 SHA1 739475d7b1c793792364fd60ec7543d8b658b719 SHA256 f454f746be4f5347ded722502554da87ce035bbd302b9dba065f7967daaa9c86 +EBUILD libXt-1.0.5.ebuild 754 RMD160 9818c9544f47514b941781509f5e79fbfa73966b SHA1 7297c2426c5fa76bd19623909628559aad39f24b SHA256 00191348a1b815ee82c033c2c9f828529258bd4a22e87fc3f41cac8905ae6f6a diff --git a/x11-libs/libXt/files/libXt-1.0.5-crosscompile-makestr.patch b/x11-libs/libXt/files/libXt-1.0.5-crosscompile-makestr.patch new file mode 100644 index 0000000..f9a8e89 --- /dev/null +++ b/x11-libs/libXt/files/libXt-1.0.5-crosscompile-makestr.patch @@ -0,0 +1,79 @@ +--- configure.ac 2009-03-26 21:43:13.000000000 +0000 ++++ configure.ac.new 2009-03-26 21:43:50.000000000 +0000 +@@ -28,6 +28,10 @@ + dnl + dnl + AC_INIT(libXt, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXt) ++ ++AC_CANONICAL_BUILD ++AC_CANONICAL_HOST ++ + AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE + +@@ -37,6 +41,16 @@ + AC_PROG_CC + AC_PROG_LIBTOOL + ++AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ]) ++ ++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) ++ + PKG_CHECK_MODULES(XT, sm x11 xproto kbproto) + + # Needed for including Xalloca.h + +--- util/Makefile.am 2009-03-26 21:55:27.000000000 +0000 ++++ util/Makefile.am.new 2009-03-26 21:55:52.000000000 +0000 +@@ -1,7 +1,8 @@ + if INSTALL_MAKESTRS + bin_PROGRAMS = makestrs ++noinst_PROGRAMS = $(MAKESTRS_PROG) + else +-noinst_PROGRAMS = makestrs ++noinst_PROGRAMS = makestrs $(MAKESTRS_PROG) + endif + + EXTRA_DIST = \ +@@ -41,3 +42,11 @@ + + .man.$(APP_MAN_SUFFIX): + sed $(MAN_SUBSTS) < $< > $@ ++ ++if CROSS_COMPILING ++MAKESTRS_PROG=xmakestrs$(EXEEXT) ++ ++xmakestrs$(EXEEXT): makestrs.c ++ $(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \ ++ $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makestrs.c ++endif + +--- src/Makefile.am 2006-12-19 03:40:53.000000000 +0000 ++++ src/Makefile.am.new 2009-03-26 22:03:18.000000000 +0000 +@@ -92,12 +92,19 @@ + + STRING_LIST = $(top_srcdir)/util/string.list + ++if CROSS_COMPILING ++MAKESTRS=$(top_builddir)/util/xmakestrs ++else ++MAKESTRS=$(top_builddir)/util/makestrs ++endif ++ ++ + all-local: $(BUILT_FILES) + + $(BUILT_HEADER): $(BUILT_SOURCE) + + $(BUILT_SOURCE): +- $(top_builddir)/util/makestrs -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c ++ $(MAKESTRS) -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c + mkdir -p $(top_builddir)/src + mkdir -p $(top_builddir)/include/X11 + cp StringDefs.h $(top_builddir)/include/X11 diff --git a/x11-libs/libXt/libXt-1.0.5.ebuild b/x11-libs/libXt/libXt-1.0.5.ebuild index 672865c..d2f9748 100644 --- a/x11-libs/libXt/libXt-1.0.5.ebuild +++ b/x11-libs/libXt/libXt-1.0.5.ebuild @@ -4,6 +4,7 @@ # Must be before x-modular eclass is inherited SNAPSHOT="yes" +PATCHES="${FILESDIR}/${P}-crosscompile-makestr.patch" inherit x-modular flag-o-matic @@ -26,21 +27,3 @@ pkg_setup() { filter-ldflags -Bdirect filter-ldflags -Wl,-Bdirect } - -x-modular_src_compile() { - x-modular_src_configure - - # [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makestr' - if tc-is-cross-compiler; then - ( filter-flags -m* ; cd util && make CC=$(tc-getBUILD_CC) CFLAGS="${CFLAGS}" LDFLAGS="" clean all ) - fi - - x-modular_src_make - - # [Cross-Compile Love] Recompile 'makestr' with the target compiler, - # just in case we want to install it. - if tc-is-cross-compiler; then - ( cd util && make clean all ) - fi -} - |