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 E279C1389E2 for ; Sat, 20 Dec 2014 00:45:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E258AE0B4F; Sat, 20 Dec 2014 00:45:38 +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 19AC8E0B4F for ; Sat, 20 Dec 2014 00:45:38 +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 0F3BC34060E for ; Sat, 20 Dec 2014 00:45:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC6A1CE0F for ; Sat, 20 Dec 2014 00:45:35 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1419036346.610a1e44a5c5ca16dcb223a71d9bb5e0e1ae18b5.blueness@gentoo> Subject: [gentoo-commits] proj/hardened-dev:musl commit in: www-client/firefox/ X-VCS-Repository: proj/hardened-dev X-VCS-Files: www-client/firefox/firefox-34.0.5-r99.ebuild www-client/firefox/metadata.xml X-VCS-Directories: www-client/firefox/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 610a1e44a5c5ca16dcb223a71d9bb5e0e1ae18b5 X-VCS-Branch: musl Date: Sat, 20 Dec 2014 00:45:35 +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: 099cd822-a68f-49c2-9783-ff1bf2346ff9 X-Archives-Hash: 69aaac9826095cb31e0869876bb4dc98 commit: 610a1e44a5c5ca16dcb223a71d9bb5e0e1ae18b5 Author: Anthony G. Basile gentoo org> AuthorDate: Sat Dec 20 00:45:46 2014 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sat Dec 20 00:45:46 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=610a1e44 www-client/firefox: fixups 1) Restrick KEYWORDS to musl only arches 2) Add metadata.xml 3) Fix whitespace damage Package-Manager: portage-2.2.14 Manifest-Sign-Key: 0xF52D4BBA --- www-client/firefox/firefox-34.0.5-r99.ebuild | 54 ++++++++++++++-------------- www-client/firefox/metadata.xml | 26 ++++++++++++++ 2 files changed, 53 insertions(+), 27 deletions(-) diff --git a/www-client/firefox/firefox-34.0.5-r99.ebuild b/www-client/firefox/firefox-34.0.5-r99.ebuild index aef11fc..9ed5ca2 100644 --- a/www-client/firefox/firefox-34.0.5-r99.ebuild +++ b/www-client/firefox/firefox-34.0.5-r99.ebuild @@ -39,7 +39,7 @@ inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v5 DESCRIPTION="Firefox Web Browser" HOMEPAGE="http://www.mozilla.com/firefox" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86" SLOT="0" LICENSE="MPL-2.0 GPL-2 LGPL-2.1" IUSE="bindist hardened +minimal pgo selinux +gmp-autoupdate test" @@ -148,49 +148,49 @@ src_prepare() { EPATCH_FORCE="yes" \ epatch "${WORKDIR}/firefox" - # Avoid using basename https://bugzilla.mozilla.org/show_bug.cgi?id=1041962 + # Avoid using basename https://bugzilla.mozilla.org/show_bug.cgi?id=1041962 epatch "${FILESDIR}"/avoid-basename-musl.patch - # unavailable on Android and musl, portions from - # http://git.alpinelinux.org/cgit/aports/tree/main/firefox/fix-ipc.patch + # unavailable on Android and musl, portions from + # http://git.alpinelinux.org/cgit/aports/tree/main/firefox/fix-ipc.patch epatch "${FILESDIR}"/avoid-fts-on-nonglibc-musl.patch - # getcontext() unavailable on musl, safe to omit + # getcontext() unavailable on musl, safe to omit epatch "${FILESDIR}"/avoid-getcontext-musl.patch - # the glibc check should be non-Android Linux + # the glibc check should be non-Android Linux epatch "${FILESDIR}"/define-gettid-unconditonally-musl.patch - # unavailable on musl, yet somehow the build system still defines - # HAVE_A_OUT_H - unconditionally disable for now, better to fix configure. - # Portions from - # http://git.alpinelinux.org/cgit/aports/tree/main/firefox/fix-toolkit.patch + # unavailable on musl, yet somehow the build system still defines + # HAVE_A_OUT_H - unconditionally disable for now, better to fix configure. + # Portions from + # http://git.alpinelinux.org/cgit/aports/tree/main/firefox/fix-toolkit.patch epatch "${FILESDIR}"/dont-include-aouth-musl.patch - # non-Android Linux check should be a glibc Linux check + # non-Android Linux check should be a glibc Linux check epatch "${FILESDIR}"/fix-android-check-musl.patch - # unavailable on musl + # unavailable on musl epatch "${FILESDIR}"/fix-jemalloc-includes-musl.patch - # unavailable on musl, also wrong order of kernel headers - # Portions from - # http://git.alpinelinux.org/cgit/aports/tree/main/firefox/fix-media.patch + # unavailable on musl, also wrong order of kernel headers + # Portions from + # http://git.alpinelinux.org/cgit/aports/tree/main/firefox/fix-media.patch epatch "${FILESDIR}"/fix-mtransport-includes-musl.patch - # Dumb sctp-refimpl include fixes, to be improved and submitted upstream + # Dumb sctp-refimpl include fixes, to be improved and submitted upstream # Portions from - # http://git.alpinelinux.org/cgit/aports/tree/main/firefox/fix-netwerk.patch + # http://git.alpinelinux.org/cgit/aports/tree/main/firefox/fix-netwerk.patch epatch "${FILESDIR}"/fix-sctp-includes-musl.patch - # Files erroneously assume other headers include - # Portions from - # http://git.alpinelinux.org/cgit/aports/tree/main/firefox/fix-tools.patch + # Files erroneously assume other headers include + # Portions from + # http://git.alpinelinux.org/cgit/aports/tree/main/firefox/fix-tools.patch epatch "${FILESDIR}"/include-systypesh-musl.patch - # Incorrect assumptions about pthread_t - # https://bugzilla.mozilla.org/show_bug.cgi?id=1010194 + # Incorrect assumptions about pthread_t + # https://bugzilla.mozilla.org/show_bug.cgi?id=1010194 epatch "${FILESDIR}"/make-handleInt-unsigned-long-musl.patch - # Felix Janda's amd64 fixes + # Felix Janda's amd64 fixes epatch "${FILESDIR}"/fix-amd64-build-musl.patch - # Stagefright includes , unavailable on musl. Upstream will - # probably want to include it on Android. + # Stagefright includes , unavailable on musl. Upstream will + # probably want to include it on Android. epatch "${FILESDIR}"/dont-include-cdefsh-stagefright-musl.patch # Allow user to apply any additional patches without modifing ebuild epatch_user - # From http://git.alpinelinux.org/cgit/aports/tree/main/firefox/stab.h, added N_UNDF + # From http://git.alpinelinux.org/cgit/aports/tree/main/firefox/stab.h, added N_UNDF cp "${FILESDIR}"/stab.h "${S}"/toolkit/crashreporter/google-breakpad/src/ # Enable gnomebreakpad @@ -264,7 +264,7 @@ src_configure() { # Other ff-specific settings mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} - # mozjemalloc doesn't build on musl yet + # mozjemalloc doesn't build on musl yet mozconfig_annotate '' --disable-replace-malloc mozconfig_annotate '' --disable-jemalloc diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml new file mode 100644 index 0000000..10544e4 --- /dev/null +++ b/www-client/firefox/metadata.xml @@ -0,0 +1,26 @@ + + + +mozilla + + Disable official Firefox branding (icons, name) which + are not binary-redistributable according to upstream. + Fine-tune custom compiler + optimizations (-Os, -O0, -O1, -O2, -O3) + Allow Gecko Media Plugins (binary blobs) to be automatically + downloaded and kept up-to-date in user profiles + Prevent sdk and headers from being installed + Add support for profile-guided optimization using gcc-4.5, + for faster binaries. This option will double the compile time. + Use the system-wide x11-libs/cairo + instead of bundled. + Use the system-wide dev-libs/icu + instead of bundled. + Use the system-wide media-libs/libjpeg-turbo + instead of bundled. + Use the system-wide media-libs/libvpx + instead of bundled. + Use the system-wide dev-db/sqlite + installation with secure-delete enabled + +