Received: by mail.netbsd.org (Postfix, from userid 605) id 0CBA384DA5; Sun, 7 Aug 2022 19:07:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4557084D4D for ; Sun, 7 Aug 2022 19:07:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id b5meZ_KeCZJ2 for ; Sun, 7 Aug 2022 19:07:05 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 81EF984C2C for ; Sun, 7 Aug 2022 19:07:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7AAE7FB1A; Sun, 7 Aug 2022 19:07:05 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1659899225217420" MIME-Version: 1.0 Date: Sun, 7 Aug 2022 19:07:05 +0000 From: "David H. Gutteridge" Subject: CVS commit: pkgsrc/www/webkit-gtk To: pkgsrc-changes@NetBSD.org Reply-To: gutteridge@netbsd.org X-Mailer: log_accum Message-Id: <20220807190705.7AAE7FB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1659899225217420 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gutteridge Date: Sun Aug 7 19:07:05 UTC 2022 Modified Files: pkgsrc/www/webkit-gtk: Makefile Log Message: webkit-gtk: drop now duplicated GCC special handling block (NFC) Equivalent code is now present in mk/compiler/gcc.mk. To generate a diff of this commit: cvs rdiff -u -r1.232 -r1.233 pkgsrc/www/webkit-gtk/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1659899225217420 Content-Disposition: inline Content-Length: 1203 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/webkit-gtk/Makefile diff -u pkgsrc/www/webkit-gtk/Makefile:1.232 pkgsrc/www/webkit-gtk/Makefile:1.233 --- pkgsrc/www/webkit-gtk/Makefile:1.232 Sun Aug 7 15:45:38 2022 +++ pkgsrc/www/webkit-gtk/Makefile Sun Aug 7 19:07:05 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.232 2022/08/07 15:45:38 leot Exp $ +# $NetBSD: Makefile,v 1.233 2022/08/07 19:07:05 gutteridge Exp $ DISTNAME= webkitgtk-2.36.6 PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} @@ -26,18 +26,6 @@ CTF_SUPPORTED= no # 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 PKGCONFIG_OVERRIDE+= Source/JavaScriptCore/javascriptcoregtk.pc.in PKGCONFIG_OVERRIDE+= Source/WebKit/gtk/webkit2gtk-web-extension.pc.in --_----------=_1659899225217420--