diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-03-21 14:05:45 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-03-21 14:05:45 +0000 |
| commit | 24f4df21395b6ca493d23871b5a245e2cddc68f4 (patch) | |
| tree | d8967413803beef0548bc4b900491a79a78618b9 /x11-libs/libX11 | |
| parent | Default to /etc/portage/make.conf #338032 by Dennis Schridde. (diff) | |
| download | historical-24f4df21395b6ca493d23871b5a245e2cddc68f4.tar.gz historical-24f4df21395b6ca493d23871b5a245e2cddc68f4.tar.bz2 historical-24f4df21395b6ca493d23871b5a245e2cddc68f4.zip | |
Fix cross-compile hack to work with current xorg-2 and autotools-utils eclasses' out-of-tree builds. Also apply it only when actually cross-compiling.
Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64
Diffstat (limited to 'x11-libs/libX11')
| -rw-r--r-- | x11-libs/libX11/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/libX11/Manifest | 14 | ||||
| -rw-r--r-- | x11-libs/libX11/libX11-1.4.2.ebuild | 9 |
3 files changed, 25 insertions, 5 deletions
diff --git a/x11-libs/libX11/ChangeLog b/x11-libs/libX11/ChangeLog index ac42227aadfc..0bec2d4010ff 100644 --- a/x11-libs/libX11/ChangeLog +++ b/x11-libs/libX11/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/libX11 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.170 2011/03/18 18:29:08 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.171 2011/03/21 14:05:45 flameeyes Exp $ + + 21 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org> libX11-1.4.2.ebuild: + Fix cross-compile hack to work with current xorg-2 and autotools-utils + eclasses' out-of-tree builds. Also apply it only when actually + cross-compiling. *libX11-1.4.2 (18 Mar 2011) diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest index 36ea4b74897b..5da0dc21f868 100644 --- a/x11-libs/libX11/Manifest +++ b/x11-libs/libX11/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX libX11-1.1.4-aix-pthread.patch 300 RMD160 88a513751566665b4284331df0e2a51f1e2e3ed9 SHA1 c61372b9f2eafd2109be4ba947e30f4250011fc5 SHA256 4b7fcb715a3a7568b8febeac29cfb32674c56e884a8bd274ddc6a2d69ea1dfe3 AUX libX11-1.1.5-solaris.patch 246 RMD160 ec5fb4d330c45f248f77ae4236f11141eee5a32c SHA1 10c031e08415147a0824d96f3eec7cfefb895e5e SHA256 89210b0559e936cdb0a42b9bc5df9bf47704b88b53d93d329b372ca855cddd0c AUX libX11-1.1.5-winnt-private.patch 420 RMD160 6406109f3addf9721f01f8fd78d24c8303535218 SHA1 91212c729b4a7e1f34207f73cfa415670d62ef91 SHA256 d0349ef4d379ab3eefa33a28d20e0ec9c630ab0b5c64a52c3849cc8d1d4abba0 @@ -8,6 +11,13 @@ DIST libX11-1.4.2.tar.bz2 2215822 RMD160 165b764130d82f32fe5ad342d1913fbba84f450 EBUILD libX11-1.3.4.ebuild 1219 RMD160 b9328c3b147a185971fac5572aeb9692147ef132 SHA1 4b66ff6fc77f683286bcdd7e8f6f0b1672682ad1 SHA256 2e142008c3264e2834bc3a0955762f7bae81feb8f327877c4607405a3c619396 EBUILD libX11-1.3.6.ebuild 1233 RMD160 ba14e54ba35fd151d02fab1a03ea3a92dad657d9 SHA1 b74a5a3bdd99ee988e7f80f586ccc6047b97aa96 SHA256 fb1b92a16aaebd4b7828d3b997687da9508d5fe14f0ad55f08c520c9e7777a36 EBUILD libX11-1.4.1.ebuild 1436 RMD160 d1181384bca5579bdf4c951a972d3e12b4474a81 SHA1 f29f4adb8787ccff0b2352f89db22c05a169c254 SHA256 095f6e1772f2fef52ba1f489f224348955a95ce229488da7bb89722c85045b45 -EBUILD libX11-1.4.2.ebuild 1431 RMD160 20fc0f65592ecfb5b54a760864d95a4d4c7ece0a SHA1 e6f6e8cfb31e43befeb58aa0fabd70e34c57a375 SHA256 d724a1fe2f6038f65c029e29825d23d1afe77399c281adb608b453ac27a72e51 -MISC ChangeLog 22732 RMD160 5f4996df8d66db49f9c5afd27fb201069c1c7258 SHA1 e749307a7165a66432d3b7240151f9ac312f0b96 SHA256 10d39f9e38f963e19b0681d609605d6a43be114e4b59eaac76d82320bcda9587 +EBUILD libX11-1.4.2.ebuild 1504 RMD160 7ee5cd7c52ed51881cc3a32ef7fd2d1e7ea49c1e SHA1 51f20172f18859db8889447baa6aea97369c7586 SHA256 8a5875d66a8a568247ab899abcafd9787727874f24701733d8bb4b9e2088941b +MISC ChangeLog 22967 RMD160 31fb78c6c13abd9450a9bd07590dc60fb56bdb53 SHA1 df7c988c4f18526846087f761c73d5c898aceedc SHA256 227e86226ee6c9a4432f272a906fcc7cc42bae7b60224219e87b409006869ce2 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk2HWy8ACgkQAiZjviIA2Xi0MACffIkQ7SjVOLcLEIhnankH1NCy +xjoAoKw5Stj+idbbCr7utb16kW4bExl3 +=Rxc1 +-----END PGP SIGNATURE----- diff --git a/x11-libs/libX11/libX11-1.4.2.ebuild b/x11-libs/libX11/libX11-1.4.2.ebuild index 22ba190c9161..323488f5bba1 100644 --- a/x11-libs/libX11/libX11-1.4.2.ebuild +++ b/x11-libs/libX11/libX11-1.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.4.2.ebuild,v 1.1 2011/03/18 18:29:08 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.4.2.ebuild,v 1.2 2011/03/21 14:05:45 flameeyes Exp $ EAPI=4 @@ -45,6 +45,11 @@ src_configure() { src_compile() { # [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makekeys' - ( filter-flags -m* ; cd src/util && make CC=$(tc-getBUILD_CC) CFLAGS="${CFLAGS}" LDFLAGS="" clean all) + if tc-is-cross-compiler; then + ( + filter-flags -m* + emake -C "${AUTOTOOLS_BUILD_DIR}"/src/util CC=$(tc-getBUILD_CC) CFLAGS="${CFLAGS}" LDFLAGS="" clean all || die + ) + fi xorg-2_src_compile } |