| 1 |
commit: 1475facd618047d536d168aa30aea4206dde0e24 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 19 15:31:33 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 14 00:46:56 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1475facd |
| 7 |
|
| 8 |
www-client/firefox: [QA] inline ESYSROOT |
| 9 |
|
| 10 |
ESYSROOT is SYSROOT/EPREFIX in >= EAPI 7 |
| 11 |
|
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
www-client/firefox/firefox-91.8.0.ebuild | 6 +++--- |
| 15 |
www-client/firefox/firefox-99.0.1.ebuild | 4 ++-- |
| 16 |
2 files changed, 5 insertions(+), 5 deletions(-) |
| 17 |
|
| 18 |
diff --git a/www-client/firefox/firefox-91.8.0.ebuild b/www-client/firefox/firefox-91.8.0.ebuild |
| 19 |
index f9c38109c42c..1c0f236cbdb3 100644 |
| 20 |
--- a/www-client/firefox/firefox-91.8.0.ebuild |
| 21 |
+++ b/www-client/firefox/firefox-91.8.0.ebuild |
| 22 |
@@ -722,8 +722,8 @@ src_configure() { |
| 23 |
--with-system-zlib \ |
| 24 |
--with-toolchain-prefix="${CHOST}-" \ |
| 25 |
--with-unsigned-addon-scopes=app,system \ |
| 26 |
- --x-includes="${SYSROOT}${EPREFIX}/usr/include" \ |
| 27 |
- --x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)" |
| 28 |
+ --x-includes="${ESYSROOT}/usr/include" \ |
| 29 |
+ --x-libraries="${ESYSROOT}/usr/$(get_libdir)" |
| 30 |
|
| 31 |
# Set update channel |
| 32 |
local update_channel=release |
| 33 |
@@ -775,7 +775,7 @@ src_configure() { |
| 34 |
mozconfig_use_with system-harfbuzz system-graphite2 |
| 35 |
mozconfig_use_with system-icu |
| 36 |
mozconfig_use_with system-jpeg |
| 37 |
- mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr" |
| 38 |
+ mozconfig_use_with system-libevent system-libevent "${ESYSROOT}/usr" |
| 39 |
mozconfig_use_with system-libvpx |
| 40 |
mozconfig_use_with system-png |
| 41 |
mozconfig_use_with system-webp |
| 42 |
|
| 43 |
diff --git a/www-client/firefox/firefox-99.0.1.ebuild b/www-client/firefox/firefox-99.0.1.ebuild |
| 44 |
index c9a7bcf776d1..6305adb8c35e 100644 |
| 45 |
--- a/www-client/firefox/firefox-99.0.1.ebuild |
| 46 |
+++ b/www-client/firefox/firefox-99.0.1.ebuild |
| 47 |
@@ -718,8 +718,8 @@ src_configure() { |
| 48 |
--with-system-zlib \ |
| 49 |
--with-toolchain-prefix="${CHOST}-" \ |
| 50 |
--with-unsigned-addon-scopes=app,system \ |
| 51 |
- --x-includes="${SYSROOT}${EPREFIX}/usr/include" \ |
| 52 |
- --x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)" |
| 53 |
+ --x-includes="${ESYSROOT}/usr/include" \ |
| 54 |
+ --x-libraries="${ESYSROOT}/usr/$(get_libdir)" |
| 55 |
|
| 56 |
# Set update channel |
| 57 |
local update_channel=release |
Archives