From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EC7F71396D0 for ; Tue, 19 Sep 2017 19:37:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 33A57E0AF0; Tue, 19 Sep 2017 19:37:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 102BCE0AF0 for ; Tue, 19 Sep 2017 19:37:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C8A27340DF9 for ; Tue, 19 Sep 2017 19:37:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35898748D for ; Tue, 19 Sep 2017 19:37:38 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1505849851.107da21cdbb7f32f52206dd9f46a9eb0b2553588.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/android-tools/android-tools-6.0.1_p79.ebuild X-VCS-Directories: dev-util/android-tools/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 107da21cdbb7f32f52206dd9f46a9eb0b2553588 X-VCS-Branch: master Date: Tue, 19 Sep 2017 19:37:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 540a2a47-3052-406e-a11b-4ede5f84a30b X-Archives-Hash: 1dcae7d31ec396458c49be1f523a4135 commit: 107da21cdbb7f32f52206dd9f46a9eb0b2553588 Author: Zac Medico gentoo org> AuthorDate: Tue Sep 19 19:31:42 2017 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Sep 19 19:37:31 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=107da21c dev-util/android-tools: detect rubygems interpreter for bug 631398 Fixes: https://bugs.gentoo.org/631398 Package-Manager: Portage-2.3.8, Repoman-2.3.3 dev-util/android-tools/android-tools-6.0.1_p79.ebuild | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild index 954e418c562..c08ea80eb0d 100644 --- a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild +++ b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild @@ -29,7 +29,7 @@ RDEPEND="sys-libs/zlib:= dev-libs/libpcre" # dev-lang/ruby is necessary for build script generation. DEPEND="${RDEPEND} - dev-lang/ruby:*" + virtual/rubygems" S=${WORKDIR} @@ -61,8 +61,16 @@ src_prepare() { } src_compile() { - chmod +x ./generate_build.rb || die - ./generate_build.rb > build.sh || die + # Dynamically detect rubygems interpreter (bug 631398). + local ruby_bin=$(type -P ruby) ruby_error_log=${T}/generate_build.rb.log success= + for ruby_bin in "${ruby_bin}" "${ruby_bin}"[[:digit:]][[:digit:]]; do + "${ruby_bin}" ./generate_build.rb 1> build.sh 2> "${ruby_error_log}" && \ + { success=1; break; } + done + if [[ -z ${success} ]]; then + cat "${ruby_error_log}" >&2 + die "${ruby_bin} ./generate_build.rb failed" + fi sed -e 's:^gcc:${CC}:' -e 's:^g++:${CXX}:' -i build.sh || die chmod +x build.sh || die tc-export CC CXX