CVS commit: pkgsrc/www

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Jan  7 15:06:21 UTC 2022

Modified Files:
        pkgsrc/www/firefox: mozilla-common.mk
        pkgsrc/www/firefox91: mozilla-common.mk

Log Message:
firefox: add a whitespace to libpci.so SUBST

Fixes build failure on Linux when PKG_DEVELOPER due to substitution
not having any effect on that platform otherwise.
Also backport some mozilla-common.mk changes to firefox91.


To generate a diff of this commit:
cvs rdiff -u -r1.217 -r1.218 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/firefox91/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.217 pkgsrc/www/firefox/mozilla-common.mk:1.218
--- pkgsrc/www/firefox/mozilla-common.mk:1.217  Sun Dec 26 19:15:13 2021
+++ pkgsrc/www/firefox/mozilla-common.mk        Fri Jan  7 15:06:21 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.217 2021/12/26 19:15:13 gutteridge Exp $
+# $NetBSD: mozilla-common.mk,v 1.218 2022/01/07 15:06:21 tnn Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -135,7 +135,7 @@ SUBST_CLASSES+=                             fix-libpci-soname
 SUBST_STAGE.fix-libpci-soname=         pre-configure
 SUBST_MESSAGE.fix-libpci-soname=       Fixing libpci soname
 SUBST_FILES.fix-libpci-soname+=                ${MOZILLA_DIR}toolkit/xre/glxtest.cpp
-SUBST_SED.fix-libpci-soname+=          -e 's,libpci.so,lib${PCIUTILS_LIBNAME}.so,'
+SUBST_SED.fix-libpci-soname+=          -e 's,"libpci.so, "lib${PCIUTILS_LIBNAME}.so,'
 
 CONFIG_GUESS_OVERRIDE+=                ${MOZILLA_DIR}build/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=                ${MOZILLA_DIR}js/src/build/autoconf/config.guess

Index: pkgsrc/www/firefox91/mozilla-common.mk
diff -u pkgsrc/www/firefox91/mozilla-common.mk:1.3 pkgsrc/www/firefox91/mozilla-common.mk:1.4
--- pkgsrc/www/firefox91/mozilla-common.mk:1.3  Sun Dec 19 11:09:27 2021
+++ pkgsrc/www/firefox91/mozilla-common.mk      Fri Jan  7 15:06:21 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.3 2021/12/19 11:09:27 nia Exp $
+# $NetBSD: mozilla-common.mk,v 1.4 2022/01/07 15:06:21 tnn Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -103,7 +103,13 @@ CONFIGURE_ARGS+=   --with-system-webp
 CONFIGURE_ARGS+=       --disable-icf
 CONFIGURE_ARGS+=       --disable-updater
 
-#CONFIGURE_ARGS+=      --with-libclang-path=${PREFIX}/lib
+.include "../../mk/compiler.mk"
+
+.if empty(PKGSRC_COMPILER:Mclang)
+# Set path to "clang for cbindgen" when target compiler is not clang.
+CONFIGURE_ARGS+=       --with-clang-path=${PREFIX}/bin/clang
+.endif
+CONFIGURE_ARGS+=       --with-libclang-path=${PREFIX}/lib
 
 SUBST_CLASSES+=                        fix-paths
 SUBST_STAGE.fix-paths=         pre-configure
@@ -117,7 +123,7 @@ SUBST_CLASSES+=                             fix-libpci-soname
 SUBST_STAGE.fix-libpci-soname=         pre-configure
 SUBST_MESSAGE.fix-libpci-soname=       Fixing libpci soname
 SUBST_FILES.fix-libpci-soname+=                ${MOZILLA_DIR}toolkit/xre/glxtest.cpp
-SUBST_SED.fix-libpci-soname+=          -e 's,libpci.so,lib${PCIUTILS_LIBNAME}.so,'
+SUBST_SED.fix-libpci-soname+=          -e 's,"libpci.so, "lib${PCIUTILS_LIBNAME}.so,'
 
 CONFIG_GUESS_OVERRIDE+=                ${MOZILLA_DIR}build/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=                ${MOZILLA_DIR}js/src/build/autoconf/config.guess
@@ -162,19 +168,6 @@ create-rm-wrapper:
          ${WRAPPER_DIR}/bin/rm
        chmod +x ${WRAPPER_DIR}/bin/rm
 
-.PHONY: fix-clang-wrapper
-pre-configure: fix-clang-wrapper
-fix-clang-wrapper:
-.if empty(PKGSRC_COMPILER:M*clang*)
-# Firefox requires Clang during the build, even when building with GCC.
-# XXX: When using GCC, pkgsrc provides 'clang' wrappers that are actually gcc.
-# This breaks the build.
-# PR pkg/55647 https://gnats.netbsd.org/55647
-       ${LN} -sf ${PREFIX}/bin/clang ${WRKDIR}/.cwrapper/bin/clang
-       ${LN} -sf ${PREFIX}/bin/clang++ ${WRKDIR}/.cwrapper/bin/clang++
-       ${LN} -sf ${PREFIX}/bin/clang-cpp ${WRKDIR}/.cwrapper/bin/clang-cpp
-.endif
-
 # The configure test for __thread succeeds, but later we end up with:
 # dist/bin/libxul.so: undefined reference to `__tls_get_addr'
 CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no