summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2014-06-16 19:56:26 +0000
committerUlrich Müller <ulm@gentoo.org>2014-06-16 19:56:26 +0000
commit3719aaf7641db8ca804b974d6be6158b602e45f4 (patch)
tree038bea166535bc0e01a15300c2576a9d53f91a23 /x11-libs
parentsys-kernel/aufs-sources: Fix aufs3 patchset, #513440 (diff)
downloadhistorical-3719aaf7641db8ca804b974d6be6158b602e45f4.tar.gz
historical-3719aaf7641db8ca804b974d6be6158b602e45f4.tar.bz2
historical-3719aaf7641db8ca804b974d6be6158b602e45f4.zip
Enable workaround for wmluiltok on non-native ABIs only, bug 513370.
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0x9433907D693FB5B8!
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/motif/ChangeLog5
-rw-r--r--x11-libs/motif/Manifest29
-rw-r--r--x11-libs/motif/motif-2.3.4-r2.ebuild10
3 files changed, 23 insertions, 21 deletions
diff --git a/x11-libs/motif/ChangeLog b/x11-libs/motif/ChangeLog
index 8d5794db8516..7021b1ae6f6a 100644
--- a/x11-libs/motif/ChangeLog
+++ b/x11-libs/motif/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/motif
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.49 2014/06/14 11:18:57 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.50 2014/06/16 19:56:02 ulm Exp $
+
+ 16 Jun 2014; Ulrich Müller <ulm@gentoo.org> motif-2.3.4-r2.ebuild:
+ Enable workaround for wmluiltok on non-native ABIs only, bug 513370.
14 Jun 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> motif-2.3.4-r2.ebuild:
x86 stable wrt bug #510454
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index 66d147342632..407cff96ead6 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -8,23 +8,20 @@ DIST openMotif-2.2.3.tar.gz 5149785 SHA256 12fc0d1de53ff30307603e31826db9b63a442
DIST openmotif-2.2.3-patches-5.tar.xz 19972 SHA256 69e1b1e37023ce0aa65c1aa8bdb60a6b2ead3472df26f1d10bffae7386b24c35 SHA512 62c0489d1bda83952e1c8d39e8c8fe0ee5a4d2927f9139227cb80b2c58751d63d95b70fff3eb165219e75cdfdc299f92d90482124e6334a28781a13b174786c9 WHIRLPOOL e2f8abc439d25d631b8489e1007788e931ea4982957d50e0e3e1062b76a3d37b279140f30bac95ab378a76cc33d5a49c1c217a66c441959510d9a96d7409d4af
EBUILD motif-2.2.3-r12.ebuild 1906 SHA256 860bfaf6865e592ecf62d708f0476a7d8d5c915e10cbe7646815a4ec4d94825e SHA512 01dceb4775003dc3115837a29ee85d1a5b7d853f9eda8f4c0489b99891f9763c101379273e0ffea76c20729282d1cd5664b934639da3b66ae35e19d81b1c93b7 WHIRLPOOL 43b946ab1ad94ecc48844551fde2bd20e997654f4cfb3fe438e56fe82c29ffd4dc6c05f67e480d41a7399d584982d87b624091998e48cec5b3d249b0156ffad1
EBUILD motif-2.3.4-r1.ebuild 3770 SHA256 c9d5bbcb90b0d00f7f347a1da92deaaf89fdb514510c55422269009ca64cbecf SHA512 b5409fec5326c3e0410b383714c07250774802b207f4f2f13cbeac966206640767d05cab5c4cdf2ba93874017e819aef7ec9f26c21b8e56babf2518a1df5a637 WHIRLPOOL 463e3608b6d23dbcb6b0e2e375ba366f7dd94bd00c3291029b00feedc9cb1121af2c38f9fa52f4aa09b17748ddfbd8723655f204971ee43eafb88f3100c91850
-EBUILD motif-2.3.4-r2.ebuild 3376 SHA256 2b0462308a9a408895dbc18d52ac926380a0f7f62c3a6b97e76a7df6914c1f1b SHA512 6824d78edde6651dcf70968bcb3399cebe7d1ef8718ad455921b14fcb1e84272e4a6f5e10bd16102211571259ff16a72d6248b27d6e562b1c16404c46c59a40a WHIRLPOOL 8f27b6692de4234ad6b6ac4ef131f94940fcc435f7ef642d2bfc07debd8f6d972673038552ae123143e9eecd407c9faf1a041ee2acd8a8730e169b154843cd88
-MISC ChangeLog 47970 SHA256 459be794dda89e5c79d059c131bb4ab2704d79a668e322e6f2e09d56be9d3405 SHA512 a380e43ee7e4f842ec6043e511c0ddb6fad1d290e189605e495d577199156b71ab68fc3c45e8dbe427d61009ae59f06dadc0693320db0611d890017d1b7bfce4 WHIRLPOOL 19c3d9fa8ce5663a242f98bf29917214152b1a2dd5a991ae9047b85c3bd8871ad10bce738944fef2081554407a83c6163231852eea5dec2907c1478a185de6af
+EBUILD motif-2.3.4-r2.ebuild 3411 SHA256 ee250a10e635cfd2e38deab38f73d051ca0e0212aa25bd69e5ea3c439707ed74 SHA512 3f718921afa5345e07e02b4dbfe833db3db3ab37ff6ddc87fcd6afb76bb1136d1e79343fe757fe5637bb1f61c487726c5792bf66020999bdf0e32c90787e8a9e WHIRLPOOL 7b9463815fa139cbbd4512b6fb583b076fc9f54a20cf471630f3c00a383486bfb05359c125fd9456fe0933020183667987f62c39740a2a843866c69a3c6a4b4e
+MISC ChangeLog 48105 SHA256 0afeb02f7fe606b95e6e833b7663465c5cbada711f41b88e278a3164369a85dc SHA512 f556a2f17fefc88afee9f543192d67e686c4e92d2cbfb637683185ba63c27f8edc2792deec1876d43d13e28323b392a6edf74e1638de0480bd3edfa74ab7158c WHIRLPOOL 7aa20f96e7ae74a9184cbdff057ccb97191293ddf934869bfc66582572aabd9b7a7b1cfe64236d921d422b22aec318f8aa13788e7b6dd45c6a36f32c98ac3886
MISC metadata.xml 289 SHA256 3c01ca1c89b14ec531baa83995a170fb4eaf7072daea1f12a87c5fe3aaec81a5 SHA512 f80ef1bc9169c6027df0715e76c50786aedb1053a35c699c5cacffd2c3e4d0640e123d5ec67634cfcfb1bdc2de43dba6f6819b1a3bd5458d061da675a23ecb80 WHIRLPOOL dbbda9b74ae8b7ed91a3abab4398484706036c51c4fb8c0f1df3c4539c9c2a8c4075abdd172ef2c734d952d13202928870d32b0b6189bbd41fa2431b53de72c3
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
-iQIcBAEBCAAGBQJTnC+nAAoJEE8aJVXqcZkdn5IQAKd2qvr3LiJmb+eXhnoQ2cNL
-duGtY/YaqZ1lN337Pnfesf/2tPBBtn8ubthyZwGe4bJ2NumDrskeM+lkhnh/u8/3
-tK9W2HRFUhrqHYqkijI6nwB3TcjRSmrX8nB257ynpEbhfhjN/dLrVG1ITBr37uNQ
-QT77uuTIapcbpp6H3BJgX3oHYuv8tQe3kxA+TCs1KcpFxSytdmCqMtT2Sstb0uo+
-6YLG2XftutGuUnKCdNO/OZIznvTefbPV0zm1FreNf5VLFCy4LTkglTZ2Ur5GN3Jl
-syF3NCN57qbkTzm2WpHZGYu//qneGLTdNEH8BapNJIeosZtRhnefv+WL9ynOZMzr
-O3svYVT0dIp0TbC2Lm4FK8PerUB/zBOEzLwf/dPDRHc0VdcpKGjxzbydyqwGvQNb
-YmoTiGQWp7ugmJ+BSon2Vapr//T3IWIFWK5PsBIMcAna+FRh6G6Tp6HFuSwv2dfy
-wHZ2xbZO6ssyVHlwTdGiWYdBNWLQK7lzshdq7ClQ4J4TzZJyOsVX6ZozRqNfYk9X
-FYNqNZ7nP/GBHFxZSmF8EudLlg1Il6DKUoSR9Y+qEV69hRpJ2A2GxNQLEnMgja98
-naHbMAXaCAXt32fL7FGXoBtYcPDn/xWgmobZyM9MpSn9BD3ufwr71/q9OnZot8fy
-ISEKNthgXrKx4hOk8Tpd
-=J60i
+iQGcBAEBCAAGBQJTn0w4AAoJEJQzkH1pP7W42x0MAJ9JCl63y43tItJQTqg5T0rG
+FNjzumrsFgywi5wq63Evn+rKLZkrG/7zdjLKznMEE9fT22uZTMxHgj3zjGLVKk1+
+DPH+mJFcd71CmJy/OGpLHGMYfkykVoFfKkVxH56C7N3b7/G+wzK1hCRO1dsfcaIR
+ySjRwh+uZ18rBcGAUZ0Ms2El4uJzkgOMr4I9bmnR9+i66UJWJ7nwr5NF2cPPQ2FF
+iMgGdduqbdk+QTF/uM01g2dL4e7SDafDN+3Ks9/zoVGAW+njfYzj2im08tFE4pV4
+szILs7/PZhSd7eEgM6pv3y/LXnEolQZhmvYK20RMBKz4ikzYtsbEVJKSIAKaiHQW
+Xc8iumarIjiX+pJTxzr172aT3v+bTs8K5PZ9QXaqq63LfTmdIBXUvHPZaM8QXHF6
+nJB1NXi2Bd2OTg2m8X39vfwihk7x3xyavRxsoQoUEnQvCJt+j1miANBYpIUTXCdY
+dQ7tOUQ0ZRKT4aZRSPxuJIuvzC024CcYUQOEfYOPiA==
+=OZpY
-----END PGP SIGNATURE-----
diff --git a/x11-libs/motif/motif-2.3.4-r2.ebuild b/x11-libs/motif/motif-2.3.4-r2.ebuild
index 498aabb5d355..fa6dd6e556aa 100644
--- a/x11-libs/motif/motif-2.3.4-r2.ebuild
+++ b/x11-libs/motif/motif-2.3.4-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r2.ebuild,v 1.6 2014/06/14 11:18:57 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r2.ebuild,v 1.7 2014/06/16 19:56:02 ulm Exp $
EAPI=5
@@ -83,9 +83,11 @@ multilib_src_configure() {
}
multilib_src_compile() {
- # The wmluiltok build tool is linked with libfl.a, therefore compile
- # it for the build platform's ABI
- emake -C tools/wml CC="$(tc-getBUILD_CC)" LIBS="-lfl" wmluiltok
+ if ! multilib_is_native_abi; then
+ # The wmluiltok build tool is linked with libfl.a, therefore compile
+ # it for the build platform's ABI
+ emake -C tools/wml CC="$(tc-getBUILD_CC)" LIBS="-lfl" wmluiltok
+ fi
emake
}