From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B0A63138CDB for ; Fri, 12 Jun 2015 01:22:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 241DDE0877; Fri, 12 Jun 2015 01:22:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9C799E0877 for ; Fri, 12 Jun 2015 01:22:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6B20F34050D for ; Fri, 12 Jun 2015 01:22:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E2F1A0C for ; Fri, 12 Jun 2015 01:22:39 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1434072117.ed2f2c158adfafc3ea73358f2713dc8b4d182986.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/ X-VCS-Repository: proj/mozilla X-VCS-Files: www-client/firefox/firefox-38.0.1.ebuild X-VCS-Directories: www-client/firefox/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: ed2f2c158adfafc3ea73358f2713dc8b4d182986 X-VCS-Branch: master Date: Fri, 12 Jun 2015 01:22:39 +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: 8bcbfb41-3f89-487e-9498-fd81603d0a13 X-Archives-Hash: 39736d6362002fd7f1aa84d061af6282 commit: ed2f2c158adfafc3ea73358f2713dc8b4d182986 Author: Jory A. Pratt gentoo org> AuthorDate: Fri Jun 12 01:21:57 2015 +0000 Commit: Jory Pratt gentoo org> CommitDate: Fri Jun 12 01:21:57 2015 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=ed2f2c15 Add gtk3,egl support. Fix arm builds ... Thanks nerdboy for the work!!! www-client/firefox/firefox-38.0.1.ebuild | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/www-client/firefox/firefox-38.0.1.ebuild b/www-client/firefox/firefox-38.0.1.ebuild index 65e6e6b..c03e6ee 100644 --- a/www-client/firefox/firefox-38.0.1.ebuild +++ b/www-client/firefox/firefox-38.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-36.0.4.ebuild,v 1.1 2015/03/24 08:53:56 polynomial-c Exp $ +# $Header: $ EAPI="5" VIRTUALX_REQUIRED="pgo" @@ -45,7 +45,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linu SLOT="0" LICENSE="MPL-2.0 GPL-2 LGPL-2.1" -IUSE="bindist hardened +minimal pgo selinux +gmp-autoupdate test" +IUSE="bindist egl gtk3 hardened +minimal neon pgo selinux +gmp-autoupdate test" RESTRICT="!bindist? ( bindist )" # More URIs appended below... @@ -210,6 +210,26 @@ src_configure() { # Add full relro support for hardened use hardened && append-ldflags "-Wl,-z,relro,-z,now" + if use neon ; then + mozconfig_annotate '' --with-fpu=neon + mozconfig_annotate '' --with-thumb=yes + mozconfig_annotate '' --with-thumb-interwork=no + fi + + if [[ ${CHOST} == armv* ]] ; then + mozconfig_annotate '' --with-float-abi=hard + mozconfig_annotate '' --enable-skia + + if ! use system-libvpx ; then + sed -i -e "s|softfp|hard|" \ + "${S}"/media/libvpx/moz.build + fi + fi + + use gtk3 && mozconfig_annotate 'Enable Cairo Gtk+3 support' --enable-default-toolkit=cairo-gtk3 + + use egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL + # Setup api key for location services echo -n "${_google_api_key}" > "${S}"/google-api-key mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key" @@ -233,6 +253,9 @@ src_configure() { if [[ $(gcc-major-version) -lt 4 ]]; then append-cxxflags -fno-stack-protector fi + + # workaround for funky/broken upstream configure... + emake -f client.mk configure } src_compile() { @@ -263,7 +286,7 @@ src_compile() { else CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \ - emake -f client.mk + emake -f client.mk realbuild fi }