diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-16 12:59:29 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-16 12:59:29 +0000 |
| commit | 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch) | |
| tree | ade7cb031f363fad64c77139dea7aa3d81908537 /eclass/mozconfig-v6.60.eclass | |
| parent | 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff) | |
gentoo resync : 16.02.1018
Diffstat (limited to 'eclass/mozconfig-v6.60.eclass')
| -rw-r--r-- | eclass/mozconfig-v6.60.eclass | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/eclass/mozconfig-v6.60.eclass b/eclass/mozconfig-v6.60.eclass index de09ebcd6408..b090218ac814 100644 --- a/eclass/mozconfig-v6.60.eclass +++ b/eclass/mozconfig-v6.60.eclass @@ -114,7 +114,10 @@ RDEPEND=">=app-text/hunspell-1.5.4:= system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) - system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) + system-libvpx? ( + >=media-libs/libvpx-1.5.0:0=[postproc] + <media-libs/libvpx-1.8 + ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) " @@ -218,6 +221,11 @@ mozconfig_config() { # Must pass release in order to properly select linker mozconfig_annotate 'Enable by Gentoo' --enable-release + # Set correct update channel, bug 677722 + if [[ -n "${MOZ_ESR}" ]] ; then + mozconfig_annotate 'set update channel to ESR' --enable-update-channel=esr + fi + # Avoid auto-magic on linker if use clang ; then # This is upstream's default |