Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www Set SHELL=${CONFIG_SHELL} in mozilla builds.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/aef1e2cc32ca
branches:  trunk
changeset: 428462:aef1e2cc32ca
user:      riastradh <riastradh%pkgsrc.org@localhost>
date:      Tue Apr 28 06:56:48 2020 +0000

description:
Set SHELL=${CONFIG_SHELL} in mozilla builds.

Otherwise configure gets confused if SHELL happens to be unset in
the environment, e.g. if you always do builds with `env -i
PATH=/bin:/usr/bin:$PREFIX/bin bmake ...'.

diffstat:

 www/firefox/mozilla-common.mk   |  3 ++-
 www/firefox52/mozilla-common.mk |  3 ++-
 www/firefox60/mozilla-common.mk |  3 ++-
 www/firefox68/mozilla-common.mk |  3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diffs (68 lines):

diff -r ae87f5f201c1 -r aef1e2cc32ca www/firefox/mozilla-common.mk
--- a/www/firefox/mozilla-common.mk     Tue Apr 28 05:47:25 2020 +0000
+++ b/www/firefox/mozilla-common.mk     Tue Apr 28 06:56:48 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.163 2020/04/11 00:30:18 gdt Exp $
+# $NetBSD: mozilla-common.mk,v 1.164 2020/04/28 06:56:48 riastradh Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -140,6 +140,7 @@
 CONFIG_SUB_OVERRIDE+=          ${MOZILLA_DIR}/js/ctypes/libffi/config.sub
 
 CONFIGURE_ENV+=                CPP=${CPP:Q}
+ALL_ENV+=              SHELL=${CONFIG_SHELL:Q}
 
 # Build outside ${WRKSRC}
 # Try to avoid conflict with config/makefiles/xpidl/Makefile.in
diff -r ae87f5f201c1 -r aef1e2cc32ca www/firefox52/mozilla-common.mk
--- a/www/firefox52/mozilla-common.mk   Tue Apr 28 05:47:25 2020 +0000
+++ b/www/firefox52/mozilla-common.mk   Tue Apr 28 06:56:48 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.6 2020/04/25 16:37:24 rillig Exp $
+# $NetBSD: mozilla-common.mk,v 1.7 2020/04/28 06:56:48 riastradh Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -93,6 +93,7 @@
 CONFIG_SUB_OVERRIDE+=          ${MOZILLA_DIR}/js/ctypes/libffi/config.sub
 
 CONFIGURE_ENV+=                CPP=${CPP}
+ALL_ENV+=              SHELL=${CONFIG_SHELL:Q}
 
 # Build outside ${WRKSRC}
 # Try to avoid conflict with config/makefiles/xpidl/Makefile.in
diff -r ae87f5f201c1 -r aef1e2cc32ca www/firefox60/mozilla-common.mk
--- a/www/firefox60/mozilla-common.mk   Tue Apr 28 05:47:25 2020 +0000
+++ b/www/firefox60/mozilla-common.mk   Tue Apr 28 06:56:48 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.9 2020/03/30 19:46:02 joerg Exp $
+# $NetBSD: mozilla-common.mk,v 1.10 2020/04/28 06:56:48 riastradh Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -106,6 +106,7 @@
 CONFIG_SUB_OVERRIDE+=          ${MOZILLA_DIR}/js/ctypes/libffi/config.sub
 
 CONFIGURE_ENV+=                CPP=${CPP}
+ALL_ENV+=              SHELL=${CONFIG_SHELL:Q}
 
 SUBST_CLASSES+=                python
 SUBST_STAGE.python=    pre-configure
diff -r ae87f5f201c1 -r aef1e2cc32ca www/firefox68/mozilla-common.mk
--- a/www/firefox68/mozilla-common.mk   Tue Apr 28 05:47:25 2020 +0000
+++ b/www/firefox68/mozilla-common.mk   Tue Apr 28 06:56:48 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.9 2020/03/30 19:46:03 joerg Exp $
+# $NetBSD: mozilla-common.mk,v 1.10 2020/04/28 06:56:48 riastradh Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -125,6 +125,7 @@
 CONFIG_SUB_OVERRIDE+=          ${MOZILLA_DIR}/js/ctypes/libffi/config.sub
 
 CONFIGURE_ENV+=                CPP=${CPP:Q}
+ALL_ENV+=              SHELL=${CONFIG_SHELL:Q}
 
 # Build outside ${WRKSRC}
 # Try to avoid conflict with config/makefiles/xpidl/Makefile.in



Home | Main Index | Thread Index | Old Index