commit: 610a1e44a5c5ca16dcb223a71d9bb5e0e1ae18b5 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Sat Dec 20 00:45:46 2014 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> 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 - # <fts.h> unavailable on Android and musl, portions from - # http://git.alpinelinux.org/cgit/aports/tree/main/firefox/fix-ipc.patch + # <fts.h> 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 - # <a.out.h> 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 + # <a.out.h> 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 - # <sys/sysctl.h> unavailable on musl + # <sys/sysctl.h> unavailable on musl epatch "${FILESDIR}"/fix-jemalloc-includes-musl.patch - # <sys/sysctl.h> unavailable on musl, also wrong order of kernel headers - # Portions from - # http://git.alpinelinux.org/cgit/aports/tree/main/firefox/fix-media.patch + # <sys/sysctl.h> 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 <sys/types.h> - # Portions from - # http://git.alpinelinux.org/cgit/aports/tree/main/firefox/fix-tools.patch + # Files erroneously assume other headers include <sys/types.h> + # 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 <sys/cdefs.h>, unavailable on musl. Upstream will - # probably want to include it on Android. + # Stagefright includes <sys/cdefs.h>, 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 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> +<herd>mozilla</herd> +<use> + <flag name="bindist">Disable official Firefox branding (icons, name) which + are not binary-redistributable according to upstream.</flag> + <flag name="custom-optimization">Fine-tune custom compiler + optimizations (-Os, -O0, -O1, -O2, -O3)</flag> + <flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically + downloaded and kept up-to-date in user profiles</flag> + <flag name="minimal"> Prevent sdk and headers from being installed</flag> + <flag name="pgo">Add support for profile-guided optimization using gcc-4.5, + for faster binaries. This option will double the compile time.</flag> + <flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg> + instead of bundled.</flag> + <flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> + instead of bundled.</flag> + <flag name="system-jpeg">Use the system-wide <pkg>media-libs/libjpeg-turbo</pkg> + instead of bundled.</flag> + <flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg> + instead of bundled.</flag> + <flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg> + installation with secure-delete enabled</flag> +</use> +</pkgmetadata>
