- Add 0001-fplll-fix-namespace-issue.patch

OBS-URL: https://build.opensuse.org/package/show/science/gap-float?expand=0&rev=22
This commit is contained in:
Jan Engelhardt 2022-11-27 23:45:01 +00:00 committed by Git OBS Bridge
parent 5e3990c02b
commit c82a577bc8
3 changed files with 54 additions and 4 deletions

View File

@ -0,0 +1,49 @@
From f952fd99fc1b6934708ae64cbe92ec1c1ec4e419 Mon Sep 17 00:00:00 2001
From: Jerome Benoit <quartermaster@rezozer.net>
Date: Sun, 3 Jul 2022 17:11:31 +0200
Subject: [PATCH] fplll: fix namespace issue
Description: fix fplll namespace issue
Upstream maintainer of FPLLL has removed from `root` fplll.h
'using namespace fplll' (commit e886a8899f71ca78711fdf420e6817432b2fe4be),
this patch mimics the former behviour at the scale of this package.
Origin: vendor, Debian
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2022-07-03
---
m4/ac_check_fplll.m4 | 5 ++++-
src/fplll.C | 2 ++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/m4/ac_check_fplll.m4 b/m4/ac_check_fplll.m4
index a6e2945..224f87c 100644
--- a/m4/ac_check_fplll.m4
+++ b/m4/ac_check_fplll.m4
@@ -68,7 +68,10 @@ if test "$found_fplll" = false; then
AX_CXX_COMPILE_STDCXX([11],[noext],[mandatory])
AC_CHECK_HEADER(fplll.h,[found_fplll=true],[found_fplll=false],[#include <mpfr.h>])
AC_MSG_CHECKING([for lllReduction in -fplll (version 5.x)])
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <fplll.h>],[ZZ_mat<mpz_t> M(3,3);lll_reduction(M, 0.99, 0.51, LM_WRAPPER);])],[AC_MSG_RESULT([yes]);found_fplll=5],[AC_MSG_RESULT([no]);found_fplll=false])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#include <fplll.h>
+using namespace fplll;
+]],[ZZ_mat<mpz_t> M(3,3);lll_reduction(M, 0.99, 0.51, LM_WRAPPER);])],[AC_MSG_RESULT([yes]);found_fplll=5],[AC_MSG_RESULT([no]);found_fplll=false])
fi
AC_LANG_POP([C++])
diff --git a/src/fplll.C b/src/fplll.C
index 45241c2..832c7b1 100644
--- a/src/fplll.C
+++ b/src/fplll.C
@@ -23,6 +23,8 @@
#include "floattypes.h"
#include <fplll.h>
+using namespace fplll;
+
typedef Obj (*ObjFunc)(); // I never could get the () and * right
--
2.38.1

View File

@ -3,6 +3,7 @@ Sun Nov 27 23:28:35 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
- Update to release 1.0.3 - Update to release 1.0.3
* No changelog was provided * No changelog was provided
- Add 0001-fplll-fix-namespace-issue.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 14 22:05:01 UTC 2018 - Jan Engelhardt <jengelh@inai.de> Wed Nov 14 22:05:01 UTC 2018 - Jan Engelhardt <jengelh@inai.de>

View File

@ -25,6 +25,7 @@ Group: Productivity/Scientific/Math
URL: https://gap-packages.github.io/float/ URL: https://gap-packages.github.io/float/
#Git-Clone: https://github.com/gap-packages/float #Git-Clone: https://github.com/gap-packages/float
Source: https://github.com/gap-packages/float/releases/download/v%version/float-%version.tar.gz Source: https://github.com/gap-packages/float/releases/download/v%version/float-%version.tar.gz
Patch1: 0001-fplll-fix-namespace-issue.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: gap-devel >= 4.11 BuildRequires: gap-devel >= 4.11
@ -34,7 +35,7 @@ BuildRequires: libtool
BuildRequires: mpc-devel BuildRequires: mpc-devel
BuildRequires: mpfi-devel BuildRequires: mpfi-devel
BuildRequires: mpfr-devel BuildRequires: mpfr-devel
BuildRequires: pkgconfig(fplll) BuildRequires: pkgconfig(fplll) >= 5
Requires: gap-core >= 4.11 Requires: gap-core >= 4.11
Requires: gap-gapdoc >= 1.0 Requires: gap-gapdoc >= 1.0
@ -44,12 +45,11 @@ with arbitrary precision. It is based on MPFR, MPFI, MPC, CXSC,
FPLLL. FPLLL.
%prep %prep
%autosetup -n float-%version %autosetup -n float-%version -p1
%build %build
autoreconf -fi autoreconf -fi
%configure --with-gaproot="%gapdir" --without-fplll --without-cxsc %configure --with-gaproot="%gapdir" --without-cxsc
# fplll is too new
%make_build %make_build
%install %install