From: Jeroen Roovers Date: Sat, 22 Oct 2011 17:16:53 +0000 (+0000) Subject: Add workaround for target_arch issue (bug #342819). Marked ~hppa (bug #332593). X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=af48b4887637ffa67b7c061ce5162deaba1ee4f7;p=gentoo.git Add workaround for target_arch issue (bug #342819). Marked ~hppa (bug #332593). Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64 --- diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog index a2cec4b803f3..c3f6ae069016 100644 --- a/dev-lang/ruby/ChangeLog +++ b/dev-lang/ruby/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/ruby # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.513 2011/10/22 16:53:31 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.514 2011/10/22 17:16:53 jer Exp $ + + 22 Oct 2011; Jeroen Roovers ruby-1.9.3_rc1.ebuild: + Add workaround for target_arch issue (bug #342819). Marked ~hppa (bug + #332593). 22 Oct 2011; Jeroen Roovers ruby-1.9.2_p290.ebuild: Add workaround for target_arch issue (bug #342819). Marked ~hppa (bug diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index 9044271e0e08..c46b5a1853fa 100644 --- a/dev-lang/ruby/Manifest +++ b/dev-lang/ruby/Manifest @@ -14,13 +14,13 @@ EBUILD ruby-1.8.7_p334-r1.ebuild 5572 RMD160 7a4fcb776af39dfce8f260ba5306a096e97 EBUILD ruby-1.8.7_p334-r2.ebuild 5581 RMD160 89236897da74277d8a5e95db6a1c3069c94a9cc4 SHA1 d829e326c6427be75ead646da31e6b9209540ea9 SHA256 99047695afacfa3f9375830de5a0aa0cfd099477d962dedeccc44ece5f52304e EBUILD ruby-1.8.7_p352.ebuild 5566 RMD160 fe282bd97112fcb877ebb57ee43538dd3c759f97 SHA1 6ec3b45330b15db35672238f7939f1f36ae36b2c SHA256 6b048c8621cd3ee0cf3bb64caf6f1790dd1d853bd7695a7404d7ca08f55b85c8 EBUILD ruby-1.9.2_p290.ebuild 6279 RMD160 2215a7788c875b45e778b51d438b5335a3ceb3b3 SHA1 569fc00a5f8898c6bee0be94073aa60c1bee00d9 SHA256 43b723866205d109c964cff9f8c155ffc05c7f552fc67676c12c69b3e6bb50d4 -EBUILD ruby-1.9.3_rc1.ebuild 6276 RMD160 104e5b39a4920598a9728c28b98b58baa3ad66b6 SHA1 21550dbd764e45412e0eac3c21f289172d705215 SHA256 1235af9a74f06eff0a738d551bcbfcb9fc20be133f889248edd2dcf34bc9b3fe -MISC ChangeLog 78522 RMD160 ff91849eb8addfb93d120b92b97dfaa4073ee92c SHA1 9a8f040600b0f5513a04b60cde10e73790a3f605 SHA256 442061aeabb0483ceb9c0666702a25f0dbc04b8490857d8e917f24b8d865b352 +EBUILD ruby-1.9.3_rc1.ebuild 6363 RMD160 2a66f37da64ed1983f7461eade5eecd6afba19b0 SHA1 51959ffd869f0a83d44af291b9df29e30fd3bc1a SHA256 5de11a1edacb1e88ff953965f7a9ce7d9b5e17cea2a0a18f305e7f07300f94bc +MISC ChangeLog 78677 RMD160 2888e11c32246d472e217f6ac8a977a6cf3b4145 SHA1 df26b03b60ca8ae83c03a22a42f157c88ad8e321 SHA256 aceef8b4a49b8c17788b2fcf8671c8dc432c03d471295a693ed4f7b1dadfe976 MISC metadata.xml 1388 RMD160 2e3de2f87f5bade79976069f8a4e89ecff342d10 SHA1 a0ed685628b1f5de88e81e1aacc56c28bb2bb52f SHA256 365a88ae053d47050b6b50d05eb518755a3aeb0c91ca77d2d8eeabfd24a2447f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk6i9REACgkQVWmRsqeSphNE4QCfZV+m3e9Q9KDWWMHhFRuIgMkD -+YEAniIflK8a9XIvBpz3h7Vh2Dyfz9Je -=B4kI +iEYEARECAAYFAk6i+osACgkQVWmRsqeSphMN0gCfbvUGU2WIMgvgWtyEb8EdhBGf +wccAn1YuB4wos+EtfyU4mejls/kXGrD6 +=G0zW -----END PGP SIGNATURE----- diff --git a/dev-lang/ruby/ruby-1.9.3_rc1.ebuild b/dev-lang/ruby/ruby-1.9.3_rc1.ebuild index 00698093017a..7bfbdc70c2ab 100644 --- a/dev-lang/ruby/ruby-1.9.3_rc1.ebuild +++ b/dev-lang/ruby/ruby-1.9.3_rc1.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/dev-lang/ruby/ruby-1.9.3_rc1.ebuild,v 1.1 2011/10/22 10:13:46 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_rc1.ebuild,v 1.2 2011/10/22 17:16:53 jer Exp $ EAPI=2 @@ -35,7 +35,7 @@ SRC_URI="mirror://ruby/1.9/${MY_P}.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2" LICENSE="|| ( Ruby BSD-2 )" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline +yaml" #libedit # libedit support is removed everywhere because of this upstream bug: @@ -121,6 +121,9 @@ src_configure() { # fi myconf="${myconf} $(use_with readline)" + # Set a faux target (bug #342819) + use hppa && myconf="${myconf} --target=parisc" + econf \ --program-suffix=${MY_SUFFIX} \ --with-soname=ruby${MY_SUFFIX} \