Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Jun 2020 14:59:56 +0000 (UTC)
From:      Gleb Popov <arrowd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r540397 - in head/math/givaro: . files
Message-ID:  <202006251459.05PExuQi005887@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: arrowd
Date: Thu Jun 25 14:59:56 2020
New Revision: 540397
URL: https://svnweb.freebsd.org/changeset/ports/540397

Log:
  math/givaro: Fix build on CURRENT.
  
  PR:		247537
  Approved by:	pi (maintainer)

Added:
  head/math/givaro/files/patch-src_kernel_gmp++_gmp++__int.h   (contents, props changed)
  head/math/givaro/files/patch-src_kernel_gmp++_gmp++__int__cstor.C   (contents, props changed)
Modified:
  head/math/givaro/Makefile
  head/math/givaro/files/patch-configure.ac

Modified: head/math/givaro/Makefile
==============================================================================
--- head/math/givaro/Makefile	Thu Jun 25 14:51:47 2020	(r540396)
+++ head/math/givaro/Makefile	Thu Jun 25 14:59:56 2020	(r540397)
@@ -3,6 +3,7 @@
 PORTNAME=	givaro
 PORTVERSION=	4.1.1
 DISTVERSIONPREFIX=v
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	pi@FreeBSD.org

Modified: head/math/givaro/files/patch-configure.ac
==============================================================================
--- head/math/givaro/files/patch-configure.ac	Thu Jun 25 14:51:47 2020	(r540396)
+++ head/math/givaro/files/patch-configure.ac	Thu Jun 25 14:59:56 2020	(r540397)
@@ -1,6 +1,6 @@
---- configure.ac.orig	2017-11-23 13:32:58 UTC
+--- configure.ac.orig	2019-06-07 13:23:45 UTC
 +++ configure.ac
-@@ -52,11 +52,7 @@ AC_COMPILER_NAME
+@@ -49,11 +49,7 @@ AC_COMPILER_NAME
  
  # We need a C++11 compiler now - AB 2014-12-12
  # clang-3.8 does not support __float128 without explicitly passing it -std=c++11

Added: head/math/givaro/files/patch-src_kernel_gmp++_gmp++__int.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/givaro/files/patch-src_kernel_gmp++_gmp++__int.h	Thu Jun 25 14:59:56 2020	(r540397)
@@ -0,0 +1,10 @@
+--- src/kernel/gmp++/gmp++_int.h.orig	2019-06-07 13:23:45 UTC
++++ src/kernel/gmp++/gmp++_int.h
+@@ -234,6 +234,7 @@ namespace Givaro {
+          */
+         ///@{
+         giv_all_inlined Integer& operator = (const Integer& n);
++        giv_all_inlined Integer& operator = (const Integer& n) const;
+         giv_all_inlined Integer& logcpy(const Integer& n);
+         giv_all_inlined Integer& copy(const Integer& n);
+         ///@}

Added: head/math/givaro/files/patch-src_kernel_gmp++_gmp++__int__cstor.C
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/givaro/files/patch-src_kernel_gmp++_gmp++__int__cstor.C	Thu Jun 25 14:59:56 2020	(r540397)
@@ -0,0 +1,14 @@
+--- src/kernel/gmp++/gmp++_int_cstor.C.orig	2019-06-07 13:23:45 UTC
++++ src/kernel/gmp++/gmp++_int_cstor.C
+@@ -105,6 +105,11 @@ namespace Givaro {
+         return logcpy(n) ;
+     }
+ 
++    Integer& Integer::operator = (const Integer &n) const
++    {
++        return const_cast<Integer*>(this)->logcpy(n) ;
++    }
++
+ 
+     Integer& Integer::copy(const Integer &n)
+     {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006251459.05PExuQi005887>