Received: by mail.netbsd.org (Postfix, from userid 605) id 28C4484E72; Mon, 23 Dec 2019 19:54:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A581D84D22 for ; Mon, 23 Dec 2019 19:54:52 +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 iyQ2LYGpxGLY for ; Mon, 23 Dec 2019 19:54:52 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 293C284CD5 for ; Mon, 23 Dec 2019 19:54:52 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 234C5FA97; Mon, 23 Dec 2019 19:54:52 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1577130892251300" MIME-Version: 1.0 Date: Mon, 23 Dec 2019 19:54:52 +0000 From: "Niclas Rosenvik" Subject: CVS commit: pkgsrc/math/xylib To: pkgsrc-changes@NetBSD.org Reply-To: nros@netbsd.org X-Mailer: log_accum Message-Id: <20191223195452.234C5FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1577130892251300 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nros Date: Mon Dec 23 19:54:52 UTC 2019 Modified Files: pkgsrc/math/xylib: distinfo pkgsrc/math/xylib/patches: patch-xylib_cache.h Log Message: Fix build of math/xylib on gcc 6 and above gcc 6 and above inmplicity uses c++14 so use std::shared_ptr. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/xylib/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/xylib/patches/patch-xylib_cache.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1577130892251300 Content-Disposition: inline Content-Length: 1887 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/math/xylib/distinfo diff -u pkgsrc/math/xylib/distinfo:1.6 pkgsrc/math/xylib/distinfo:1.7 --- pkgsrc/math/xylib/distinfo:1.6 Tue Nov 3 23:33:46 2015 +++ pkgsrc/math/xylib/distinfo Mon Dec 23 19:54:51 2019 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2015/11/03 23:33:46 agc Exp $ +$NetBSD: distinfo,v 1.7 2019/12/23 19:54:51 nros Exp $ SHA1 (xylib-1.0.tar.bz2) = 3664b6753e11673e637ced473ce00d24ff0ce338 RMD160 (xylib-1.0.tar.bz2) = 3a125a7d08a60fa65e22a0b09122069a160ebfac SHA512 (xylib-1.0.tar.bz2) = 765f111729b2e4b42a3f127e2279fdb50da52a20ada9fff2baba55b27ba30406b0edf4c0b58287eacbf4ec20818641201b7b78324b8752c9094568179924fe31 Size (xylib-1.0.tar.bz2) = 287286 bytes -SHA1 (patch-xylib_cache.h) = a34d702b8b5a4525255717f0971e1fa1f651cfee +SHA1 (patch-xylib_cache.h) = 100fb29385aa701621b5305a17386668247ba789 Index: pkgsrc/math/xylib/patches/patch-xylib_cache.h diff -u pkgsrc/math/xylib/patches/patch-xylib_cache.h:1.1 pkgsrc/math/xylib/patches/patch-xylib_cache.h:1.2 --- pkgsrc/math/xylib/patches/patch-xylib_cache.h:1.1 Tue Apr 30 22:26:29 2013 +++ pkgsrc/math/xylib/patches/patch-xylib_cache.h Mon Dec 23 19:54:51 2019 @@ -1,13 +1,21 @@ -$NetBSD: patch-xylib_cache.h,v 1.1 2013/04/30 22:26:29 joerg Exp $ +$NetBSD: patch-xylib_cache.h,v 1.2 2019/12/23 19:54:51 nros Exp $ ---- xylib/cache.h.orig 2013-04-29 18:52:26.000000000 +0000 +* use std::shared_prt on gcc 6 and above since they implicitly use c++14 + +--- xylib/cache.h.orig 2012-07-25 22:25:14.000000000 +0000 +++ xylib/cache.h -@@ -28,7 +28,10 @@ +@@ -28,7 +28,16 @@ #define XYLIB_USE_TR1_MEMORY 1 #endif -#if XYLIB_USE_TR1_MEMORY -+#if defined(_LIBCPP_VERSION) ++#ifdef __GNUC__ ++#if __GNUC__ >= 6 ++#define __GNU_V6__ ++#endif ++#endif ++ ++#if defined(_LIBCPP_VERSION) || defined(__GNU_V6__) +# include +using std::shared_ptr; +#elif XYLIB_USE_TR1_MEMORY --_----------=_1577130892251300--