public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/, www-client/firefox/
@ 2015-09-07 20:32 Ian Stakenvicius
  0 siblings, 0 replies; 3+ messages in thread
From: Ian Stakenvicius @ 2015-09-07 20:32 UTC (permalink / raw
  To: gentoo-commits

commit:     1602509da7c0b88c9a22ef15bde49c91566eaa8e
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  7 20:29:40 2015 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Mon Sep  7 20:31:58 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1602509d

firefox,thunderbird: Ensure $SHELL gets set to something

Zero_Chaos noticed when building firefox within catalyst that failures would
occur due to the build system not finding the correct shell.  It was determined
this was due to catalyst not setting SHELL in the environment, which resulted in
the firefox build system being passed SHELL="" and causing the failure.

This commit ensures SHELL will never be empty by hard-coding /bin/bash (EPREFIX'd
when appropriate) if there is no SHELL specified in the environment.

Changed ebuilds:
www-client/firefox-38.2.1
www-client/firefox-40.0.3
mail-client/thunderbird-38.2.0

Package-Manager: portage-2.2.20.1

 mail-client/thunderbird/thunderbird-38.2.0.ebuild | 2 +-
 www-client/firefox/firefox-38.2.1.ebuild          | 4 ++--
 www-client/firefox/firefox-40.0.3.ebuild          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mail-client/thunderbird/thunderbird-38.2.0.ebuild b/mail-client/thunderbird/thunderbird-38.2.0.ebuild
index f7f9b9e..c7a4cf9 100644
--- a/mail-client/thunderbird/thunderbird-38.2.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-38.2.0.ebuild
@@ -244,7 +244,7 @@ src_compile() {
 	mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die
 
 	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
 	emake -f "${S}"/client.mk
 
 	# Only build enigmail extension if crypt enabled.

diff --git a/www-client/firefox/firefox-38.2.1.ebuild b/www-client/firefox/firefox-38.2.1.ebuild
index fde4d4e..2c1fe1f 100644
--- a/www-client/firefox/firefox-38.2.1.ebuild
+++ b/www-client/firefox/firefox-38.2.1.ebuild
@@ -275,11 +275,11 @@ src_compile() {
 		addpredict "${cards}"
 
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
 		Xemake -f client.mk profiledbuild || die "Xemake failed"
 	else
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
 		emake -f client.mk realbuild
 	fi
 

diff --git a/www-client/firefox/firefox-40.0.3.ebuild b/www-client/firefox/firefox-40.0.3.ebuild
index 89f6657..c71527a 100644
--- a/www-client/firefox/firefox-40.0.3.ebuild
+++ b/www-client/firefox/firefox-40.0.3.ebuild
@@ -277,11 +277,11 @@ src_compile() {
 		addpredict "${cards}"
 
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
 		Xemake -f client.mk profiledbuild || die "Xemake failed"
 	else
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
 		emake -f client.mk realbuild
 	fi
 


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/, www-client/firefox/
@ 2022-05-11 17:06 Florian Schmaus
  0 siblings, 0 replies; 3+ messages in thread
From: Florian Schmaus @ 2022-05-11 17:06 UTC (permalink / raw
  To: gentoo-commits

commit:     8e794d95234b58f4c06487bcea7ed6cf8e2798a8
Author:     Eva Dengler <eva.dengler <AT> fau <DOT> de>
AuthorDate: Wed May 11 08:47:08 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed May 11 17:05:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e794d95

mail-client/thunderbird,www-client/firefox: fix typo

Substitute cabability with capability.

Closes: https://github.com/gentoo/gentoo/pull/25440
Acked-by: Joonas Niilola <juippis <AT> gentoo.org>
Signed-off-by: Eva Dengler <eva.dengler <AT> fau.de>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 mail-client/thunderbird/metadata.xml | 2 +-
 www-client/firefox/metadata.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml
index ceafcda1bba6..9c44731a3a93 100644
--- a/mail-client/thunderbird/metadata.xml
+++ b/mail-client/thunderbird/metadata.xml
@@ -7,7 +7,7 @@
 </maintainer>
 <use>
 	<flag name="clang">Use Clang compiler instead of GCC</flag>
-	<flag name="eme-free">Disable EME (DRM plugin) cabability at build time</flag>
+	<flag name="eme-free">Disable EME (DRM plugin) capability at build time</flag>
 	<flag name="hwaccel">Force-enable hardware-accelerated rendering (Mozilla bug 594876)</flag>
 	<flag name="lto">Enable Link Time Optimization (LTO). Requires Gold linker when using GCC
 		or LDD linker when using Clang</flag>

diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml
index ab14fcbd11aa..6670b0e4aed1 100644
--- a/www-client/firefox/metadata.xml
+++ b/www-client/firefox/metadata.xml
@@ -7,7 +7,7 @@
 </maintainer>
 <use>
 	<flag name="clang">Use Clang compiler instead of GCC</flag>
-	<flag name="eme-free">Disable EME (DRM plugin) cabability at build time</flag>
+	<flag name="eme-free">Disable EME (DRM plugin) capability at build time</flag>
 	<flag name="geckodriver">Enable WebDriver support</flag>
 	<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically
 		downloaded and kept up-to-date in user profiles</flag>


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/, www-client/firefox/
@ 2022-09-10 18:14 Joonas Niilola
  0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2022-09-10 18:14 UTC (permalink / raw
  To: gentoo-commits

commit:     1bf8b8e9fff6f9bc4f86fedd8428edc846b5bd8a
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 18:13:50 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 18:13:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bf8b8e9

*/*: revert llvm-15 support from firefox and thunderbird

 - llvm-15 support is incomplete, and therefore not yet supported.
   Clang+lto can't be enabled with llvm-15 before rust gets support for that.

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 mail-client/thunderbird/thunderbird-102.2.2.ebuild | 10 +---------
 www-client/firefox/firefox-102.2.0.ebuild          | 10 +---------
 www-client/firefox/firefox-104.0.2.ebuild          | 10 +---------
 3 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/mail-client/thunderbird/thunderbird-102.2.2.ebuild b/mail-client/thunderbird/thunderbird-102.2.2.ebuild
index 4aba732165ec..5b45a09b43e3 100644
--- a/mail-client/thunderbird/thunderbird-102.2.2.ebuild
+++ b/mail-client/thunderbird/thunderbird-102.2.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 FIREFOX_PATCHSET="firefox-102esr-patches-02j.tar.xz"
 
-LLVM_MAX_SLOT=15
+LLVM_MAX_SLOT=14
 
 PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="ncurses,sqlite,ssl"
@@ -87,14 +87,6 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 	virtual/rust
 	|| (
-		(
-			sys-devel/clang:15
-			sys-devel/llvm:15
-			clang? (
-				=sys-devel/lld-15*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] )
-			)
-		)
 		(
 			sys-devel/clang:14
 			sys-devel/llvm:14

diff --git a/www-client/firefox/firefox-102.2.0.ebuild b/www-client/firefox/firefox-102.2.0.ebuild
index 8cfbc4b8a609..5fc46dffe81b 100644
--- a/www-client/firefox/firefox-102.2.0.ebuild
+++ b/www-client/firefox/firefox-102.2.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 FIREFOX_PATCHSET="firefox-102esr-patches-02j.tar.xz"
 
-LLVM_MAX_SLOT=15
+LLVM_MAX_SLOT=14
 
 PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="ncurses,sqlite,ssl"
@@ -89,14 +89,6 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 	virtual/rust
 	|| (
-		(
-			sys-devel/clang:15
-			sys-devel/llvm:15
-			clang? (
-				=sys-devel/lld-15*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] )
-			)
-		)
 		(
 			sys-devel/clang:14
 			sys-devel/llvm:14

diff --git a/www-client/firefox/firefox-104.0.2.ebuild b/www-client/firefox/firefox-104.0.2.ebuild
index 6c3e8c3d45c2..24cea78da335 100644
--- a/www-client/firefox/firefox-104.0.2.ebuild
+++ b/www-client/firefox/firefox-104.0.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 FIREFOX_PATCHSET="firefox-104-patches-02j.tar.xz"
 
-LLVM_MAX_SLOT=15
+LLVM_MAX_SLOT=14
 
 PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="ncurses,sqlite,ssl"
@@ -91,14 +91,6 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 	virtual/rust
 	|| (
-		(
-			sys-devel/clang:15
-			sys-devel/llvm:15
-			clang? (
-				=sys-devel/lld-15*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] )
-			)
-		)
 		(
 			sys-devel/clang:14
 			sys-devel/llvm:14


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-09-10 18:14 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-11 17:06 [gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/, www-client/firefox/ Florian Schmaus
  -- strict thread matches above, loose matches on Subject: below --
2022-09-10 18:14 Joonas Niilola
2015-09-07 20:32 Ian Stakenvicius

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox