pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math/xylib Fix build of math/xylib on gcc 6 and above



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4ccfda09c7b5
branches:  trunk
changeset: 406493:4ccfda09c7b5
user:      nros <nros%pkgsrc.org@localhost>
date:      Mon Dec 23 19:54:51 2019 +0000

description:
Fix build of math/xylib on gcc 6 and above

gcc 6 and above inmplicity uses c++14 so use std::shared_ptr.

diffstat:

 math/xylib/distinfo                    |   4 ++--
 math/xylib/patches/patch-xylib_cache.h |  16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r 0cc39c2d7d18 -r 4ccfda09c7b5 math/xylib/distinfo
--- a/math/xylib/distinfo       Mon Dec 23 13:44:55 2019 +0000
+++ b/math/xylib/distinfo       Mon Dec 23 19:54:51 2019 +0000
@@ -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
diff -r 0cc39c2d7d18 -r 4ccfda09c7b5 math/xylib/patches/patch-xylib_cache.h
--- a/math/xylib/patches/patch-xylib_cache.h    Mon Dec 23 13:44:55 2019 +0000
+++ b/math/xylib/patches/patch-xylib_cache.h    Mon Dec 23 19:54:51 2019 +0000
@@ -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 $
+
+* use std::shared_prt on gcc 6 and above since they implicitly use c++14
 
---- xylib/cache.h.orig 2013-04-29 18:52:26.000000000 +0000
+--- 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 <memory>
 +using std::shared_ptr;
 +#elif XYLIB_USE_TR1_MEMORY



Home | Main Index | Thread Index | Old Index