CVS commit: pkgsrc/mail/thunderbird

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sun Nov  8 11:27:53 UTC 2026

Modified Files:
        pkgsrc/mail/thunderbird: distinfo mozilla-common.mk
        pkgsrc/mail/thunderbird/patches:
            patch-comm_third__party_openpgp.configure

Log Message:
mail/thunderbird: Fix a build failure that occurs when CC is set to 'cc'

The original patch for ${WRKSRC}/comm/third_party/openpgp.configure only
works when CC is either 'gcc' or 'clang'. I must admit I don't fully
understand why CC is 'gcc' on some setups while on others it is 'cc'. Sorry
if I'm doing a wrong thing.


To generate a diff of this commit:
cvs rdiff -u -r1.304 -r1.305 pkgsrc/mail/thunderbird/distinfo
cvs rdiff -u -r1.32 -r1.33 pkgsrc/mail/thunderbird/mozilla-common.mk
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/mail/thunderbird/patches/patch-comm_third__party_openpgp.configure

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

Modified files:

Index: pkgsrc/mail/thunderbird/distinfo
diff -u pkgsrc/mail/thunderbird/distinfo:1.304 pkgsrc/mail/thunderbird/distinfo:1.305
--- pkgsrc/mail/thunderbird/distinfo:1.304      Fri Oct 16 16:36:07 2026
+++ pkgsrc/mail/thunderbird/distinfo    Sun Nov  8 11:27:53 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.304 2026/10/16 16:36:07 ryoon Exp $
+$NetBSD: distinfo,v 1.305 2026/11/08 11:27:53 pho Exp $
 
 BLAKE2s (thunderbird-158.0.source.tar.xz) = 45061abba5c4c844df64ae2237465deca09e49940a4dd10260289b1b5e1898df
 SHA512 (thunderbird-158.0.source.tar.xz) = fe19e0e7540ef27af0bdb730963a9b4ad91472a9ab8b0c5eddd291c2d234ab7ac68ddf71c8595090b87cfd0deeaebc66dbce15c65c90fd09183b05db4bdce263
@@ -10,7 +10,7 @@ SHA1 (patch-build_moz.configure_rust.con
 SHA1 (patch-comm_mailnews_compose_src_nsMsgCompUtils.cpp) = c3e38828803536879baf2934aa1bfa50cfba0112
 SHA1 (patch-comm_mailnews_search_src_nsMsgSearchNews.cpp) = 84624c6752de1f56848a202b3a2179a2d8098e4e
 SHA1 (patch-comm_third__party_libgcrypt_configure) = c5ca8a8b44c485f81139b54d341ac044189d98d3
-SHA1 (patch-comm_third__party_openpgp.configure) = 674e8a741d82f576549aa0bb44465d3a2577a212
+SHA1 (patch-comm_third__party_openpgp.configure) = 24f018b1b4e064cab01d6b4119d1b28c745b2adc
 SHA1 (patch-config_gcc-stl-wrapper.template.h) = b5b4f2aef747836b09584b77d6332a7010963b0b
 SHA1 (patch-config_makefiles_rust.mk) = 74c18ac9c37ff268428961275df3e77a7b1ed537
 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49

Index: pkgsrc/mail/thunderbird/mozilla-common.mk
diff -u pkgsrc/mail/thunderbird/mozilla-common.mk:1.32 pkgsrc/mail/thunderbird/mozilla-common.mk:1.33
--- pkgsrc/mail/thunderbird/mozilla-common.mk:1.32      Sat Sep 26 07:45:51 2026
+++ pkgsrc/mail/thunderbird/mozilla-common.mk   Sun Nov  8 11:27:53 2026
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.32 2026/09/26 07:45:51 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.33 2026/11/08 11:27:53 pho Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -123,6 +123,9 @@ CONFIGURE_ARGS+=    --enable-forkserver
 CONFIGURE_ARGS+=       --disable-icf
 CONFIGURE_ARGS+=       --disable-updater
 
+# See patches/patch-comm_third__party_openpgp.configure
+CONFIGURE_ENV+=                CC_TYPE=${CC_VERSION:C/-.+$//}
+
 .include "../../mk/compiler.mk"
 
 .if empty(PKGSRC_COMPILER:Mclang)

Index: pkgsrc/mail/thunderbird/patches/patch-comm_third__party_openpgp.configure
diff -u pkgsrc/mail/thunderbird/patches/patch-comm_third__party_openpgp.configure:1.2 pkgsrc/mail/thunderbird/patches/patch-comm_third__party_openpgp.configure:1.3
--- pkgsrc/mail/thunderbird/patches/patch-comm_third__party_openpgp.configure:1.2       Thu Jan 22 19:41:09 2026
+++ pkgsrc/mail/thunderbird/patches/patch-comm_third__party_openpgp.configure   Sun Nov  8 11:27:53 2026
@@ -1,6 +1,6 @@
-$NetBSD: patch-comm_third__party_openpgp.configure,v 1.2 2026/01/22 19:41:09 ryoon Exp $
+$NetBSD: patch-comm_third__party_openpgp.configure,v 1.3 2026/11/08 11:27:53 pho Exp $
 
-* Pass CC for detecting C++ compiler (GCC/clang).
+* Pass CC_TYPE (defined by mozilla-common.mk) for detecting C++ compiler (GCC/clang).
   A logic in botan/configure.py does not detect c++ from cwrappers correctly.
 * GCC does not accept --target= as argument. Remove it.
 
@@ -10,7 +10,7 @@ $NetBSD: patch-comm_third__party_openpgp
                      log.info("Botan: failed to inject libstdc++ include dirs: {}".format(e))
  
              botan_flags = [
-+                "--cc={}".format(os.getenv("CC")),
++                "--cc={}".format(os.getenv("CC_TYPE")),
                  "--cc-bin={}".format(cxx_compiler.compiler),
 -                "--cc-abi-flags={}".format(" ".join(abi_flags)),
                  "--cpu={}".format(target.cpu),