CVS commit: pkgsrc/www

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sun May 15 00:37:26 UTC 2022

Modified Files:
        pkgsrc/www/firefox52: mozilla-common.mk
        pkgsrc/www/seamonkey: mozilla-common.mk

Log Message:
mozilla-common.mk: use :Q with CPP in CONFIGURE_ENV.

Otherwise it blows up if CPP is $(CC) -E. Seen in the MacOS bulk builds.

(this commit syncs seamonkey and firefox52 with the newer firefoxes
that already have this fix)


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/firefox52/mozilla-common.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/seamonkey/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/firefox52/mozilla-common.mk
diff -u pkgsrc/www/firefox52/mozilla-common.mk:1.13 pkgsrc/www/firefox52/mozilla-common.mk:1.14
--- pkgsrc/www/firefox52/mozilla-common.mk:1.13 Thu Dec 31 20:04:13 2020
+++ pkgsrc/www/firefox52/mozilla-common.mk      Sun May 15 00:37:26 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.13 2020/12/31 20:04:13 nia Exp $
+# $NetBSD: mozilla-common.mk,v 1.14 2022/05/15 00:37:26 dholland Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -90,7 +90,7 @@ CONFIG_SUB_OVERRIDE+=         ${MOZILLA_DIR}js/
 CONFIG_SUB_OVERRIDE+=          ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub
 CONFIG_SUB_OVERRIDE+=          ${MOZILLA_DIR}/js/ctypes/libffi/config.sub
 
-CONFIGURE_ENV+=                CPP=${CPP}
+CONFIGURE_ENV+=                CPP=${CPP:Q}
 ALL_ENV+=              SHELL=${CONFIG_SHELL:Q}
 
 # Build outside ${WRKSRC}

Index: pkgsrc/www/seamonkey/mozilla-common.mk
diff -u pkgsrc/www/seamonkey/mozilla-common.mk:1.11 pkgsrc/www/seamonkey/mozilla-common.mk:1.12
--- pkgsrc/www/seamonkey/mozilla-common.mk:1.11 Mon Apr 18 18:34:33 2022
+++ pkgsrc/www/seamonkey/mozilla-common.mk      Sun May 15 00:37:26 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.11 2022/04/18 18:34:33 dholland Exp $
+# $NetBSD: mozilla-common.mk,v 1.12 2022/05/15 00:37:26 dholland Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -123,7 +123,7 @@ CONFIG_SUB_OVERRIDE+=               ${MOZILLA_DIR}js/
 CONFIG_SUB_OVERRIDE+=          ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub
 CONFIG_SUB_OVERRIDE+=          ${MOZILLA_DIR}/js/ctypes/libffi/config.sub
 
-CONFIGURE_ENV+=                CPP=${CPP}
+CONFIGURE_ENV+=                CPP=${CPP:Q}
 ALL_ENV+=              SHELL=${CONFIG_SHELL:Q}
 
 # Build outside ${WRKSRC}