1 |
commit: fee93309cd45ab053182c9d5b59d0379d1eb95b7 |
2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 23 16:22:18 2015 +0000 |
4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 23 20:55:49 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fee93309 |
7 |
|
8 |
mozilla packages: migrate arm neon/softfp/hardfp config fixes to the eclass |
9 |
|
10 |
The firefox ebuild received fixes for various arm configurations (neon, hardfp/softfp) |
11 |
but these fixes should also be applied to the other mozilla packages. This commit |
12 |
removes them from firefox and adds them to mozconfig. |
13 |
|
14 |
eclass/mozconfig-v6.38.eclass | 18 +++++++++++++++++- |
15 |
eclass/mozconfig-v6.42.eclass | 18 +++++++++++++++++- |
16 |
www-client/firefox/firefox-38.4.0.ebuild | 18 +----------------- |
17 |
www-client/firefox/firefox-38.5.0.ebuild | 18 +----------------- |
18 |
www-client/firefox/firefox-43.0.ebuild | 18 +----------------- |
19 |
5 files changed, 37 insertions(+), 53 deletions(-) |
20 |
|
21 |
diff --git a/eclass/mozconfig-v6.38.eclass b/eclass/mozconfig-v6.38.eclass |
22 |
index dc32140..ecd4578 100644 |
23 |
--- a/eclass/mozconfig-v6.38.eclass |
24 |
+++ b/eclass/mozconfig-v6.38.eclass |
25 |
@@ -45,7 +45,7 @@ esac |
26 |
# Set the variable to any value if the use flag should exist but not be default-enabled. |
27 |
|
28 |
# use-flags common among all mozilla ebuilds |
29 |
-IUSE="${IUSE} dbus debug gstreamer gstreamer-0 +jemalloc3 pulseaudio selinux startup-notification system-cairo system-icu system-jpeg system-sqlite system-libvpx" |
30 |
+IUSE="${IUSE} dbus debug gstreamer gstreamer-0 +jemalloc3 neon pulseaudio selinux startup-notification system-cairo system-icu system-jpeg system-sqlite system-libvpx" |
31 |
|
32 |
# some notes on deps: |
33 |
# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14 |
34 |
@@ -237,4 +237,20 @@ mozconfig_config() { |
35 |
mozconfig_use_with system-icu |
36 |
mozconfig_use_enable system-icu intl-api |
37 |
mozconfig_use_with system-libvpx |
38 |
+ |
39 |
+ # Modifications to better support ARM, bug 553364 |
40 |
+ if use neon ; then |
41 |
+ mozconfig_annotate '' --with-fpu=neon |
42 |
+ mozconfig_annotate '' --with-thumb=yes |
43 |
+ mozconfig_annotate '' --with-thumb-interwork=no |
44 |
+ fi |
45 |
+ if [[ ${CHOST} == armv* ]] ; then |
46 |
+ mozconfig_annotate '' --with-float-abi=hard |
47 |
+ mozconfig_annotate '' --enable-skia |
48 |
+ |
49 |
+ if ! use system-libvpx ; then |
50 |
+ sed -i -e "s|softfp|hard|" \ |
51 |
+ "${S}"/media/libvpx/moz.build |
52 |
+ fi |
53 |
+ fi |
54 |
} |
55 |
|
56 |
diff --git a/eclass/mozconfig-v6.42.eclass b/eclass/mozconfig-v6.42.eclass |
57 |
index 7ed7283..1feea38 100644 |
58 |
--- a/eclass/mozconfig-v6.42.eclass |
59 |
+++ b/eclass/mozconfig-v6.42.eclass |
60 |
@@ -55,7 +55,7 @@ esac |
61 |
# Set the variable to any value if the use flag should exist but not be default-enabled. |
62 |
|
63 |
# use-flags common among all mozilla ebuilds |
64 |
-IUSE="${IUSE} dbus debug +gstreamer gstreamer-0 +jemalloc3 pulseaudio selinux startup-notification system-cairo system-icu system-jpeg system-sqlite system-libvpx" |
65 |
+IUSE="${IUSE} dbus debug +gstreamer gstreamer-0 +jemalloc3 neon pulseaudio selinux startup-notification system-cairo system-icu system-jpeg system-sqlite system-libvpx" |
66 |
|
67 |
# some notes on deps: |
68 |
# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14 |
69 |
@@ -263,4 +263,20 @@ mozconfig_config() { |
70 |
mozconfig_use_with system-icu |
71 |
mozconfig_use_enable system-icu intl-api |
72 |
mozconfig_use_with system-libvpx |
73 |
+ |
74 |
+ # Modifications to better support ARM, bug 553364 |
75 |
+ if use neon ; then |
76 |
+ mozconfig_annotate '' --with-fpu=neon |
77 |
+ mozconfig_annotate '' --with-thumb=yes |
78 |
+ mozconfig_annotate '' --with-thumb-interwork=no |
79 |
+ fi |
80 |
+ if [[ ${CHOST} == armv* ]] ; then |
81 |
+ mozconfig_annotate '' --with-float-abi=hard |
82 |
+ mozconfig_annotate '' --enable-skia |
83 |
+ |
84 |
+ if ! use system-libvpx ; then |
85 |
+ sed -i -e "s|softfp|hard|" \ |
86 |
+ "${S}"/media/libvpx/moz.build |
87 |
+ fi |
88 |
+ fi |
89 |
} |
90 |
|
91 |
diff --git a/www-client/firefox/firefox-38.4.0.ebuild b/www-client/firefox/firefox-38.4.0.ebuild |
92 |
index 39fef48..bfe2595 100644 |
93 |
--- a/www-client/firefox/firefox-38.4.0.ebuild |
94 |
+++ b/www-client/firefox/firefox-38.4.0.ebuild |
95 |
@@ -42,7 +42,7 @@ KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux" |
96 |
|
97 |
SLOT="0" |
98 |
LICENSE="MPL-2.0 GPL-2 LGPL-2.1" |
99 |
-IUSE="bindist egl hardened +minimal neon pgo selinux +gmp-autoupdate test" |
100 |
+IUSE="bindist egl hardened +minimal pgo selinux +gmp-autoupdate test" |
101 |
RESTRICT="!bindist? ( bindist )" |
102 |
|
103 |
# More URIs appended below... |
104 |
@@ -206,22 +206,6 @@ src_configure() { |
105 |
# Add full relro support for hardened |
106 |
use hardened && append-ldflags "-Wl,-z,relro,-z,now" |
107 |
|
108 |
- if use neon ; then |
109 |
- mozconfig_annotate '' --with-fpu=neon |
110 |
- mozconfig_annotate '' --with-thumb=yes |
111 |
- mozconfig_annotate '' --with-thumb-interwork=no |
112 |
- fi |
113 |
- |
114 |
- if [[ ${CHOST} == armv* ]] ; then |
115 |
- mozconfig_annotate '' --with-float-abi=hard |
116 |
- mozconfig_annotate '' --enable-skia |
117 |
- |
118 |
- if ! use system-libvpx ; then |
119 |
- sed -i -e "s|softfp|hard|" \ |
120 |
- "${S}"/media/libvpx/moz.build |
121 |
- fi |
122 |
- fi |
123 |
- |
124 |
use egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL |
125 |
|
126 |
# Setup api key for location services |
127 |
|
128 |
diff --git a/www-client/firefox/firefox-38.5.0.ebuild b/www-client/firefox/firefox-38.5.0.ebuild |
129 |
index 038a181..48ff07d 100644 |
130 |
--- a/www-client/firefox/firefox-38.5.0.ebuild |
131 |
+++ b/www-client/firefox/firefox-38.5.0.ebuild |
132 |
@@ -42,7 +42,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linu |
133 |
|
134 |
SLOT="0" |
135 |
LICENSE="MPL-2.0 GPL-2 LGPL-2.1" |
136 |
-IUSE="bindist egl hardened +minimal neon pgo selinux +gmp-autoupdate test" |
137 |
+IUSE="bindist egl hardened +minimal pgo selinux +gmp-autoupdate test" |
138 |
RESTRICT="!bindist? ( bindist )" |
139 |
|
140 |
# More URIs appended below... |
141 |
@@ -207,22 +207,6 @@ src_configure() { |
142 |
# Add full relro support for hardened |
143 |
use hardened && append-ldflags "-Wl,-z,relro,-z,now" |
144 |
|
145 |
- if use neon ; then |
146 |
- mozconfig_annotate '' --with-fpu=neon |
147 |
- mozconfig_annotate '' --with-thumb=yes |
148 |
- mozconfig_annotate '' --with-thumb-interwork=no |
149 |
- fi |
150 |
- |
151 |
- if [[ ${CHOST} == armv* ]] ; then |
152 |
- mozconfig_annotate '' --with-float-abi=hard |
153 |
- mozconfig_annotate '' --enable-skia |
154 |
- |
155 |
- if ! use system-libvpx ; then |
156 |
- sed -i -e "s|softfp|hard|" \ |
157 |
- "${S}"/media/libvpx/moz.build |
158 |
- fi |
159 |
- fi |
160 |
- |
161 |
use egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL |
162 |
|
163 |
# Setup api key for location services |
164 |
|
165 |
diff --git a/www-client/firefox/firefox-43.0.ebuild b/www-client/firefox/firefox-43.0.ebuild |
166 |
index 2c932c1..d0229f5 100644 |
167 |
--- a/www-client/firefox/firefox-43.0.ebuild |
168 |
+++ b/www-client/firefox/firefox-43.0.ebuild |
169 |
@@ -43,7 +43,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linu |
170 |
|
171 |
SLOT="0" |
172 |
LICENSE="MPL-2.0 GPL-2 LGPL-2.1" |
173 |
-IUSE="bindist egl hardened +hwaccel +minimal neon pgo selinux +gmp-autoupdate test" |
174 |
+IUSE="bindist egl hardened +hwaccel +minimal pgo selinux +gmp-autoupdate test" |
175 |
RESTRICT="!bindist? ( bindist )" |
176 |
|
177 |
# More URIs appended below... |
178 |
@@ -220,22 +220,6 @@ src_configure() { |
179 |
# Add full relro support for hardened |
180 |
use hardened && append-ldflags "-Wl,-z,relro,-z,now" |
181 |
|
182 |
- if use neon ; then |
183 |
- mozconfig_annotate '' --with-fpu=neon |
184 |
- mozconfig_annotate '' --with-thumb=yes |
185 |
- mozconfig_annotate '' --with-thumb-interwork=no |
186 |
- fi |
187 |
- |
188 |
- if [[ ${CHOST} == armv* ]] ; then |
189 |
- mozconfig_annotate '' --with-float-abi=hard |
190 |
- mozconfig_annotate '' --enable-skia |
191 |
- |
192 |
- if ! use system-libvpx ; then |
193 |
- sed -i -e "s|softfp|hard|" \ |
194 |
- "${S}"/media/libvpx/moz.build |
195 |
- fi |
196 |
- fi |
197 |
- |
198 |
use egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL |
199 |
|
200 |
# Setup api key for location services |