CVS commit: [pkgsrc-2021Q4] pkgsrc/www/webkit-gtk

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Fri Jan 21 15:24:17 UTC 2022

Modified Files:
        pkgsrc/www/webkit-gtk [pkgsrc-2021Q4]: Makefile buildlink3.mk

Log Message:
Pullup ticket #6570 - requested by gutteridge
www/webkit-gtk: NetBSD 9 build fix, PR pkg/56604

Revisions pulled up:
- www/webkit-gtk/Makefile                                       1.219
- www/webkit-gtk/buildlink3.mk                                  1.87

---
   Module Name:    pkgsrc
   Committed By:   gutteridge
   Date:           Thu Jan 13 03:57:28 UTC 2022

   Modified Files:
           pkgsrc/www/webkit-gtk: Makefile buildlink3.mk

   Log Message:
   webkit-gtk: fix builds on NetBSD 9.x

   The base GCC 7.5 on NetBSD 9.x is missing a C++17 feature expected by
   this package now. The pkgsrc GCC 7.5 includes that feature, but the
   build still fails later on with another unmet expectation. So GCC 8 is
   now the minimum viable version with which to build this package.

   This involves a bit of a kludge to deal with how GCC from pkgsrc ends
   up linking. This is obviously not ideal, and is part of a broader
   topic that needs revisiting. The present goal is to try and stabilize
   the 2021Q4 branch.

   Tested on 9.2_STABLE/amd64 with www/badwolf. Addresses PR pkg/56604.


To generate a diff of this commit:
cvs rdiff -u -r1.217.2.1 -r1.217.2.2 pkgsrc/www/webkit-gtk/Makefile
cvs rdiff -u -r1.85.2.1 -r1.85.2.2 pkgsrc/www/webkit-gtk/buildlink3.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/webkit-gtk/Makefile
diff -u pkgsrc/www/webkit-gtk/Makefile:1.217.2.1 pkgsrc/www/webkit-gtk/Makefile:1.217.2.2
--- pkgsrc/www/webkit-gtk/Makefile:1.217.2.1    Sat Jan  1 16:49:10 2022
+++ pkgsrc/www/webkit-gtk/Makefile      Fri Jan 21 15:24:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.217.2.1 2022/01/01 16:49:10 bsiegert Exp $
+# $NetBSD: Makefile,v 1.217.2.2 2022/01/21 15:24:17 bsiegert Exp $
 
 DISTNAME=      webkitgtk-2.34.3
 PKGNAME=       ${DISTNAME:S/webkitgtk/webkit-gtk/}
@@ -19,16 +19,27 @@ TOOL_DEPENDS+=      gettext-tools>=0.18:../..
 TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
 USE_CMAKE=     yes
-USE_LANGUAGES= c c++11
+USE_LANGUAGES= c c++17
 USE_TOOLS+=    automake bash bison flex gmake perl pkg-config msgfmt
 
 # Enabling -gdwarf-2 hits GNU ar limits on file size.
 CTF_SUPPORTED= no
 
-# GCC >= 7.3.0 is required, checked via CMakeLists.txt
-GCC_REQD+=             7
+# GCC >= 8 is required, it no longer builds with lower versions.
+GCC_REQD+=             8
 USE_GCC_RUNTIME=       yes
 
+.include "../../mk/bsd.prefs.mk"
+
+# This package will link against libstdc++.so from the pkgsrc GCC when the
+# base OS GCC doesn't meet the minimum requirement. Thus we do this so the
+# appropriate gcc-libs package will be captured as a dependency, otherwise
+# binary packages will be broken. See also PR pkg/56604.
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 099915
+USE_PKGSRC_GCC=                yes
+USE_PKGSRC_GCC_RUNTIME=        yes
+.endif
+
 # Using ld.gold subverts Pkgsrc wrappers, and this package also crashes buggy
 # versions of ld.gold.
 CMAKE_ARGS+=   -DUSE_LD_GOLD=OFF

Index: pkgsrc/www/webkit-gtk/buildlink3.mk
diff -u pkgsrc/www/webkit-gtk/buildlink3.mk:1.85.2.1 pkgsrc/www/webkit-gtk/buildlink3.mk:1.85.2.2
--- pkgsrc/www/webkit-gtk/buildlink3.mk:1.85.2.1        Sat Jan  1 16:49:10 2022
+++ pkgsrc/www/webkit-gtk/buildlink3.mk Fri Jan 21 15:24:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.85.2.1 2022/01/01 16:49:10 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.85.2.2 2022/01/21 15:24:17 bsiegert Exp $
 
 BUILDLINK_TREE+=       webkit-gtk
 
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.webkit-gtk?=    webki
 BUILDLINK_PKGSRCDIR.webkit-gtk?=       ../../www/webkit-gtk
 
 # This is necessary to match the package requirement.
-GCC_REQD+=     7.3
+GCC_REQD+=     8
 
 pkgbase := webkit-gtk
 .include "../../mk/pkg-build-options.mk"