diff options
| author | tnn <tnn@pkgsrc.org> | 2022-01-07 15:06:21 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2022-01-07 15:06:21 +0000 |
| commit | 2ec00cd05e4f7477e242d100fe2332b5ec0990b4 (patch) | |
| tree | d9e045a4d6930c681d4f1aeaccd130c67655a40d /www/firefox91 | |
| parent | 0b38a8b5bc86f594282b54fdb13231e060b214db (diff) | |
| download | pkgsrc-2ec00cd05e4f7477e242d100fe2332b5ec0990b4.tar.gz | |
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.
Diffstat (limited to 'www/firefox91')
| -rw-r--r-- | www/firefox91/mozilla-common.mk | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/www/firefox91/mozilla-common.mk b/www/firefox91/mozilla-common.mk index 2b771f4812c..2520024e751 100644 --- a/www/firefox91/mozilla-common.mk +++ b/www/firefox91/mozilla-common.mk @@ -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 |