diff options
author | Sven 'sleipnir' Rebhan <odinshorse@googlemail.com> | 2010-01-23 13:06:23 +0000 |
---|---|---|
committer | Sven 'sleipnir' Rebhan <odinshorse@googlemail.com> | 2010-01-23 13:06:23 +0000 |
commit | 91c9d0f232fffeb908fc2ccd286b01b11803356b (patch) | |
tree | 36e3c0674857fa8788927aa07cdbde0209caf1f4 | |
parent | Version 1.0.7-r1 of libXt is marked stable now, so delete the keywording in t... (diff) | |
download | embedded-cross-91c9d0f232fffeb908fc2ccd286b01b11803356b.tar.gz embedded-cross-91c9d0f232fffeb908fc2ccd286b01b11803356b.tar.bz2 embedded-cross-91c9d0f232fffeb908fc2ccd286b01b11803356b.zip |
The portage version of libXt-1.0.7-r1 cross-compiles fine, so delete libXt in the overlay.
-rw-r--r-- | x11-libs/libXt/Manifest | 6 | ||||
-rw-r--r-- | x11-libs/libXt/files/libXt-1.0.5-crosscompile-makestr.patch | 82 | ||||
-rw-r--r-- | x11-libs/libXt/files/libXt-1.0.7-crosscompile-makestr.patch | 59 | ||||
-rw-r--r-- | x11-libs/libXt/libXt-1.0.5.ebuild | 29 | ||||
-rw-r--r-- | x11-libs/libXt/libXt-1.0.7.ebuild | 34 |
5 files changed, 0 insertions, 210 deletions
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest deleted file mode 100644 index 6f794c1..0000000 --- a/x11-libs/libXt/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX libXt-1.0.5-crosscompile-makestr.patch 2061 RMD160 14f7f5d245f1b045639fd121bb3ad4cade751c53 SHA1 efd04fe5253d2a084788b4bf5e6ba580183db73c SHA256 88ce00721c2b05131617e4c1b337ba2f807812710c13bf07c8ac032fc2e65080 -AUX libXt-1.0.7-crosscompile-makestr.patch 1664 RMD160 74f8cd56251b9df85fdc49e20bd74338e6dc36ff SHA1 dbd2b3cb1d92c6070c19dbb5173a49b12f71e92e SHA256 744ac74b18b97b729b4494c7e2bc2036b254697d431a2bf08c430a00621c70f4 -DIST libXt-1.0.5.tar.bz2 500502 RMD160 7e5ef9e03dc860bf5b64b85a897dd1d2ae1ed0bf SHA1 5f33921e373ce162a39eabef2ce05d946935eb5b SHA256 43c472ada59a04428a463225cd4cd42cb81bc43eb687cc1890f2f1c81a3e9cf4 -DIST libXt-1.0.7.tar.bz2 559875 RMD160 eb6553819486cef75d2cbb76e12953c6da5fb997 SHA1 3c285b9c04a393dec1cc3d60cf5582d798eb3272 SHA256 706d5248b061c8455f74ce5269ecc5ef59c27d0f52d22b07138f781928dda9ec -EBUILD libXt-1.0.5.ebuild 754 RMD160 9818c9544f47514b941781509f5e79fbfa73966b SHA1 7297c2426c5fa76bd19623909628559aad39f24b SHA256 00191348a1b815ee82c033c2c9f828529258bd4a22e87fc3f41cac8905ae6f6a -EBUILD libXt-1.0.7.ebuild 910 RMD160 e3dc35e1d49eb316454466395b82d61a09bf3ae9 SHA1 d709c1abe038bbca6bcfe9e25f8e75faaba0953a SHA256 e388ce484a9d5b1696f46d89060595e6ef6d5c4ceaaea21f54b78e7b4cd0293b 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 deleted file mode 100644 index 47e845e..0000000 --- a/x11-libs/libXt/files/libXt-1.0.5-crosscompile-makestr.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- 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,18 @@ - AC_PROG_CC - AC_PROG_LIBTOOL - -+AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ]) -+ -+if test "x${CC_FOR_BUILD+set}" != "xset" ; then -+ if test "x$cross_compiling" = "xyes" ; then -+ CC_FOR_BUILD=gcc -+ else -+ CC_FOR_BUILD=$CC -+ fi -+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,9 @@ - if INSTALL_MAKESTRS - bin_PROGRAMS = makestrs -+noinst_PROGRAMS = $(MAKESTRS_PROG) - else --noinst_PROGRAMS = makestrs -+noinst_PROGRAMS = makestrs -+noinst_PROGRAMS += $(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/files/libXt-1.0.7-crosscompile-makestr.patch b/x11-libs/libXt/files/libXt-1.0.7-crosscompile-makestr.patch deleted file mode 100644 index 9c0f0e7..0000000 --- a/x11-libs/libXt/files/libXt-1.0.7-crosscompile-makestr.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- util/Makefile.am 2009-10-07 01:31:32.000000000 +0200 -+++ util/Makefile.am.new 2009-10-27 19:27:10.927792563 +0100 -@@ -1,7 +1,9 @@ - if INSTALL_MAKESTRS - bin_PROGRAMS = makestrs -+noinst_PROGRAMS = $(MAKESTRS_PROG) - else - noinst_PROGRAMS = makestrs -+noinst_PROGRAMS += $(MAKESTRS_PROG) - endif - - CC = @CC_FOR_BUILD@ -@@ -45,3 +47,11 @@ - - .man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(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 - ---- configure.ac 2009-10-09 06:50:27.000000000 +0200 -+++ configure.ac.new 2009-10-27 19:29:43.673338645 +0100 -@@ -40,6 +40,8 @@ - AM_PROG_CC_C_O - XORG_DEFAULT_OPTIONS - -+AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ]) -+ - if test x"$CC_FOR_BUILD" = x; then - if test x"$cross_compiling" = xyes; then - AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc) - ---- src/Makefile.am 2009-10-07 01:31:32.000000000 +0200 -+++ src/Makefile.am.new 2009-10-27 19:33:00.501639668 +0100 -@@ -92,12 +92,18 @@ - - 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 deleted file mode 100644 index d2f9748..0000000 --- a/x11-libs/libXt/libXt-1.0.5.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/libXt-1.0.5.ebuild,v 1.13 2009/02/02 19:44:57 solar Exp $ - -# Must be before x-modular eclass is inherited -SNAPSHOT="yes" -PATCHES="${FILESDIR}/${P}-crosscompile-makestr.patch" - -inherit x-modular flag-o-matic - -DESCRIPTION="X.Org Xt library" - -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libSM - x11-proto/xproto - x11-proto/kbproto" -DEPEND="" - -pkg_setup() { - # No such function yet - # x-modular_pkg_setup - - # (#125465) Broken with Bdirect support - filter-flags -Wl,-Bdirect - filter-ldflags -Bdirect - filter-ldflags -Wl,-Bdirect -} diff --git a/x11-libs/libXt/libXt-1.0.7.ebuild b/x11-libs/libXt/libXt-1.0.7.ebuild deleted file mode 100644 index 6101522..0000000 --- a/x11-libs/libXt/libXt-1.0.7.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/libXt-1.0.5.ebuild,v 1.13 2009/02/02 19:44:57 solar Exp $ - -# Must be before x-modular eclass is inherited -SNAPSHOT="yes" -PATCHES="${FILESDIR}/${P}-crosscompile-makestr.patch" -CONFIGURE_OPTIONS="--disable-install-makestrs" - -inherit x-modular flag-o-matic - -DESCRIPTION="X.Org Xt library" - -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libSM - x11-proto/xproto - x11-proto/kbproto" -DEPEND="" - -pkg_setup() { - # No such function yet - # x-modular_pkg_setup - - # (#125465) Broken with Bdirect support - filter-flags -Wl,-Bdirect - filter-ldflags -Bdirect - filter-ldflags -Wl,-Bdirect - - CFLAGS_FOR_BUILD="${CFLAGS}" - _filter-var CFLAGS_FOR_BUILD -march=* - _filter-var CFLAGS_FOR_BUILD -mtune=* -} |