CVS commit: pkgsrc/www

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Apr 28 06:56:48 UTC 2020

Modified Files:
        pkgsrc/www/firefox: mozilla-common.mk
        pkgsrc/www/firefox52: mozilla-common.mk
        pkgsrc/www/firefox60: mozilla-common.mk
        pkgsrc/www/firefox68: mozilla-common.mk

Log Message:
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 ...'.


To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/firefox52/mozilla-common.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/firefox60/mozilla-common.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/firefox68/mozilla-common.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.163 pkgsrc/www/firefox/mozilla-common.mk:1.164
--- pkgsrc/www/firefox/mozilla-common.mk:1.163  Sat Apr 11 00:30:18 2020
+++ pkgsrc/www/firefox/mozilla-common.mk        Tue Apr 28 06:56:48 2020
@@ -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}nsp
 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

Index: pkgsrc/www/firefox52/mozilla-common.mk
diff -u pkgsrc/www/firefox52/mozilla-common.mk:1.6 pkgsrc/www/firefox52/mozilla-common.mk:1.7
--- pkgsrc/www/firefox52/mozilla-common.mk:1.6  Sat Apr 25 16:37:24 2020
+++ pkgsrc/www/firefox52/mozilla-common.mk      Tue Apr 28 06:56:48 2020
@@ -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}nsp
 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

Index: pkgsrc/www/firefox60/mozilla-common.mk
diff -u pkgsrc/www/firefox60/mozilla-common.mk:1.9 pkgsrc/www/firefox60/mozilla-common.mk:1.10
--- pkgsrc/www/firefox60/mozilla-common.mk:1.9  Mon Mar 30 19:46:02 2020
+++ pkgsrc/www/firefox60/mozilla-common.mk      Tue Apr 28 06:56:48 2020
@@ -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}nsp
 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

Index: pkgsrc/www/firefox68/mozilla-common.mk
diff -u pkgsrc/www/firefox68/mozilla-common.mk:1.9 pkgsrc/www/firefox68/mozilla-common.mk:1.10
--- pkgsrc/www/firefox68/mozilla-common.mk:1.9  Mon Mar 30 19:46:03 2020
+++ pkgsrc/www/firefox68/mozilla-common.mk      Tue Apr 28 06:56:48 2020
@@ -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}nsp
 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