gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

mozilla packages: migrate arm neon/softfp/hardfp config fixes to the eclass

Browse Source 
The firefox ebuild received fixes for various arm configurations (neon, hardfp/softfp)
but these fixes should also be applied to the other mozilla packages.  This commit
removes them from firefox and adds them to mozconfig.
This commit is contained in:
Ian Stakenvicius
2015-12-23 11:22:18 -05:00
parent a7e13bfe98
commit fee93309cd
5 changed files with 37 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
eclass/mozconfig-v6.38.eclass
View File

@@ -45,7 +45,7 @@ esac
# Set the variable to any value if the use flag should exist but not be default-enabled.
# use-flags common among all mozilla ebuilds
IUSE="${IUSE} dbus debug gstreamer gstreamer-0 +jemalloc3 pulseaudio selinux startup-notification system-cairo system-icu system-jpeg system-sqlite system-libvpx"
IUSE="${IUSE} dbus debug gstreamer gstreamer-0 +jemalloc3 neon pulseaudio selinux startup-notification system-cairo system-icu system-jpeg system-sqlite system-libvpx"
# some notes on deps:
# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14
@@ -237,4 +237,20 @@ mozconfig_config() {
mozconfig_use_with system-icu
mozconfig_use_enable system-icu intl-api
mozconfig_use_with system-libvpx
# Modifications to better support ARM, bug 553364
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
}

18
eclass/mozconfig-v6.42.eclass
View File

@@ -55,7 +55,7 @@ esac
# Set the variable to any value if the use flag should exist but not be default-enabled.
# use-flags common among all mozilla ebuilds
IUSE="${IUSE} dbus debug +gstreamer gstreamer-0 +jemalloc3 pulseaudio selinux startup-notification system-cairo system-icu system-jpeg system-sqlite system-libvpx"
IUSE="${IUSE} dbus debug +gstreamer gstreamer-0 +jemalloc3 neon pulseaudio selinux startup-notification system-cairo system-icu system-jpeg system-sqlite system-libvpx"
# some notes on deps:
# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14
@@ -263,4 +263,20 @@ mozconfig_config() {
mozconfig_use_with system-icu
mozconfig_use_enable system-icu intl-api
mozconfig_use_with system-libvpx
# Modifications to better support ARM, bug 553364
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
}

18
www-client/firefox/firefox-38.4.0.ebuild
View File

@@ -42,7 +42,7 @@ KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
SLOT="0"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
IUSE="bindist egl hardened +minimal neon pgo selinux +gmp-autoupdate test"
IUSE="bindist egl hardened +minimal pgo selinux +gmp-autoupdate test"
RESTRICT="!bindist? ( bindist )"
# More URIs appended below...
@@ -206,22 +206,6 @@ 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 egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL
# Setup api key for location services

18
www-client/firefox/firefox-38.5.0.ebuild
View File

@@ -42,7 +42,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 egl hardened +minimal neon pgo selinux +gmp-autoupdate test"
IUSE="bindist egl hardened +minimal pgo selinux +gmp-autoupdate test"
RESTRICT="!bindist? ( bindist )"
# More URIs appended below...
@@ -207,22 +207,6 @@ 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 egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL
# Setup api key for location services

18
www-client/firefox/firefox-43.0.ebuild
View File

@@ -43,7 +43,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 egl hardened +hwaccel +minimal neon pgo selinux +gmp-autoupdate test"
IUSE="bindist egl hardened +hwaccel +minimal pgo selinux +gmp-autoupdate test"
RESTRICT="!bindist? ( bindist )"
# More URIs appended below...
@@ -220,22 +220,6 @@ 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 egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL
# Setup api key for location services