lcalc: 2.0.5 -> 2.1.0
https://gitlab.com/sagemath/lcalc/-/releases/2.1.0 https://gitlab.com/sagemath/lcalc/-/compare/2.0.5...2.1.0
This commit is contained in:
parent
55e0b798c5
commit
5f57903405
@ -1,30 +0,0 @@
|
||||
diff --git a/src/libLfunction/Lcomplex.h b/src/libLfunction/Lcomplex.h
|
||||
index 363bbf4..ffecd70 100644
|
||||
--- a/src/libLfunction/Lcomplex.h
|
||||
+++ b/src/libLfunction/Lcomplex.h
|
||||
@@ -56,8 +56,11 @@
|
||||
#include <cmath>
|
||||
#include <sstream>
|
||||
|
||||
-namespace std
|
||||
-{
|
||||
+#ifdef _LIBCPP_VERSION
|
||||
+_LIBCPP_BEGIN_NAMESPACE_STD
|
||||
+#else
|
||||
+namespace std {
|
||||
+#endif
|
||||
// Forward declarations
|
||||
template<typename _Tp> class complex;
|
||||
template<> class complex<float>;
|
||||
@@ -1193,6 +1196,10 @@ namespace std
|
||||
inline
|
||||
complex<long double>::complex(const complex<double>& __z)
|
||||
: _M_value(_ComplexT(__z._M_value)) { }
|
||||
-} // namespace std
|
||||
+#ifdef _LIBCPP_VERSION
|
||||
+_LIBCPP_END_NAMESPACE_STD
|
||||
+#else
|
||||
+}
|
||||
+#endif
|
||||
|
||||
#endif /* _CPP_COMPLEX */
|
||||
@ -9,20 +9,16 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.0.5";
|
||||
version = "2.1.0";
|
||||
pname = "lcalc";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "sagemath";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-RxWZ7T0I9zV7jUVnL6jV/PxEoU32KY7Q1UsOL5Lonuc=";
|
||||
tag = version;
|
||||
hash = "sha256-v+7Uh6tPOfb3E9dqxx//RqD22XM4S/8ejS2v+D5G5pE=";
|
||||
};
|
||||
|
||||
# workaround for vendored GCC <complex> on libc++
|
||||
# https://gitlab.com/sagemath/lcalc/-/issues/16
|
||||
patches = [ ./libcxx-compat.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
gengetopt
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user