commit: 429490d9cf5abc857c7edf6b7336bb669f8491ab
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 00:49:39 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 14 00:49:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=429490d9
www-client/firefox: [QA] inline ESYSROOT
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-client/firefox/firefox-100.0.ebuild | 4 ++--
www-client/firefox/firefox-91.9.0.ebuild | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/www-client/firefox/firefox-100.0.ebuild
b/www-client/firefox/firefox-100.0.ebuild
index ea8e29a35647..b1bf622c4f3c 100644
--- a/www-client/firefox/firefox-100.0.ebuild
+++ b/www-client/firefox/firefox-100.0.ebuild
@@ -712,8 +712,8 @@ src_configure() {
--with-system-zlib \
--with-toolchain-prefix="${CHOST}-" \
--with-unsigned-addon-scopes=app,system \
- --x-includes="${SYSROOT}${EPREFIX}/usr/include" \
- --x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+ --x-includes="${ESYSROOT}/usr/include" \
+ --x-libraries="${ESYSROOT}/usr/$(get_libdir)"
# Set update channel
local update_channel=release
diff --git a/www-client/firefox/firefox-91.9.0.ebuild
b/www-client/firefox/firefox-91.9.0.ebuild
index 7128373e2339..bc4b2b364078 100644
--- a/www-client/firefox/firefox-91.9.0.ebuild
+++ b/www-client/firefox/firefox-91.9.0.ebuild
@@ -716,8 +716,8 @@ src_configure() {
--with-system-zlib \
--with-toolchain-prefix="${CHOST}-" \
--with-unsigned-addon-scopes=app,system \
- --x-includes="${SYSROOT}${EPREFIX}/usr/include" \
- --x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+ --x-includes="${ESYSROOT}/usr/include" \
+ --x-libraries="${ESYSROOT}/usr/$(get_libdir)"
# Set update channel
local update_channel=release
@@ -769,7 +769,7 @@ src_configure() {
mozconfig_use_with system-harfbuzz system-graphite2
mozconfig_use_with system-icu
mozconfig_use_with system-jpeg
- mozconfig_use_with system-libevent system-libevent
"${SYSROOT}${EPREFIX}/usr"
+ mozconfig_use_with system-libevent system-libevent "${ESYSROOT}/usr"
mozconfig_use_with system-libvpx
mozconfig_use_with system-png
mozconfig_use_with system-webp