Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/
Date: Sat, 14 May 2022 00:51:27
Message-Id: 1652489379.429490d9cf5abc857c7edf6b7336bb669f8491ab.sam@gentoo
1 commit: 429490d9cf5abc857c7edf6b7336bb669f8491ab
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 14 00:49:39 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat May 14 00:49:39 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=429490d9
7
8 www-client/firefox: [QA] inline ESYSROOT
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 www-client/firefox/firefox-100.0.ebuild | 4 ++--
13 www-client/firefox/firefox-91.9.0.ebuild | 6 +++---
14 2 files changed, 5 insertions(+), 5 deletions(-)
15
16 diff --git a/www-client/firefox/firefox-100.0.ebuild b/www-client/firefox/firefox-100.0.ebuild
17 index ea8e29a35647..b1bf622c4f3c 100644
18 --- a/www-client/firefox/firefox-100.0.ebuild
19 +++ b/www-client/firefox/firefox-100.0.ebuild
20 @@ -712,8 +712,8 @@ src_configure() {
21 --with-system-zlib \
22 --with-toolchain-prefix="${CHOST}-" \
23 --with-unsigned-addon-scopes=app,system \
24 - --x-includes="${SYSROOT}${EPREFIX}/usr/include" \
25 - --x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
26 + --x-includes="${ESYSROOT}/usr/include" \
27 + --x-libraries="${ESYSROOT}/usr/$(get_libdir)"
28
29 # Set update channel
30 local update_channel=release
31
32 diff --git a/www-client/firefox/firefox-91.9.0.ebuild b/www-client/firefox/firefox-91.9.0.ebuild
33 index 7128373e2339..bc4b2b364078 100644
34 --- a/www-client/firefox/firefox-91.9.0.ebuild
35 +++ b/www-client/firefox/firefox-91.9.0.ebuild
36 @@ -716,8 +716,8 @@ src_configure() {
37 --with-system-zlib \
38 --with-toolchain-prefix="${CHOST}-" \
39 --with-unsigned-addon-scopes=app,system \
40 - --x-includes="${SYSROOT}${EPREFIX}/usr/include" \
41 - --x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
42 + --x-includes="${ESYSROOT}/usr/include" \
43 + --x-libraries="${ESYSROOT}/usr/$(get_libdir)"
44
45 # Set update channel
46 local update_channel=release
47 @@ -769,7 +769,7 @@ src_configure() {
48 mozconfig_use_with system-harfbuzz system-graphite2
49 mozconfig_use_with system-icu
50 mozconfig_use_with system-jpeg
51 - mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
52 + mozconfig_use_with system-libevent system-libevent "${ESYSROOT}/usr"
53 mozconfig_use_with system-libvpx
54 mozconfig_use_with system-png
55 mozconfig_use_with system-webp