From 88f913e8ad71309ff0c0793b74e4c704489b104f Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 20 Jun 2019 22:59:12 +0200 Subject: gnu: lrcalc: Add a patch for identifying include files. * gnu/packages/patches/lrcalc-includes.patch: New file. * gnu/packages/algebra.scm (lrcalc): Use patch. * gnu/local.mk (dist_patch_DATA): Register patch. --- gnu/packages/algebra.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 561347ad98..7fca1358ff 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1503,7 +1503,8 @@ John Cremona to compute his elliptic curve database.") (file-name (git-file-name name version)) (sha256 (base32 - "1c12d04jdyxkkav4ak8d1aqrv594gzihwhpxvc6p9js0ry1fahss")))) + "1c12d04jdyxkkav4ak8d1aqrv594gzihwhpxvc6p9js0ry1fahss")) + (patches (search-patches "lrcalc-includes.patch")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From c68ec87ca7f5e56fa930541fbb6e17fd277dbf1b Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 21 Jun 2019 09:33:30 +0200 Subject: gnu: iml: Enable shared library. * gnu/packages/algebra.scm (iml): Add configure flag --enable-shared. --- gnu/packages/algebra.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 7fca1358ff..5cf981cda7 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1548,6 +1548,7 @@ structure constants of Schubert polynomials.") (arguments `(#:configure-flags (list + "--enable-shared" (string-append "--with-gmp-include=" (assoc-ref %build-inputs "gmp") "/include") (string-append "--with-gmp-lib=" -- cgit v1.2.3 From e6eafd4277fe249dfc49e953c396cd4c93977088 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 21 Jun 2019 09:49:57 +0200 Subject: gnu: symmetrica: Generate position-independent code. * gnu/packages/algebra.scm (symmetrica): Add -fPIC compiler flag. --- gnu/packages/algebra.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 5cf981cda7..03b0e48671 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1400,7 +1400,7 @@ by using an optimized quadratic sieve algorithm.") (add-after 'unpack 'fix-makefile (lambda _ (substitute* "makefile" - (("cc -c") "gcc -c")) + (("cc -c") "gcc -c -fPIC")) #t)) (add-after 'fix-makefile 'turn-off-banner (lambda _ -- cgit v1.2.3 From 468bfd13a05dec7b560ef50a70713226835facac Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 21 Jun 2019 09:55:13 +0200 Subject: gnu: ratpoints: Generate position-independent code. * gnu/packages/algebra.scm (ratpoints): Add "CCFLAGS=-fPIC" to make flags. --- gnu/packages/algebra.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 03b0e48671..edcfad1402 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1353,7 +1353,8 @@ multiplication algorithm.") (arguments `(#:test-target "test" #:make-flags - (list (string-append "INSTALL_DIR=" (assoc-ref %outputs "out"))) + (list (string-append "INSTALL_DIR=" (assoc-ref %outputs "out")) + "CCFLAGS=-fPIC") #:phases (modify-phases %standard-phases (delete 'configure) ;no configure script -- cgit v1.2.3 From a65f1e8eab8417154ac8a2b4371d0eb13b1987b9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 21 Jun 2019 22:57:19 +0200 Subject: gnu: Move ratpoints into "sagemath.scm" * gnu/packages/algebra.scm (ratpoints): Move package from here... * gnu/packages/sagemath.scm (ratpoints): ... to here. --- gnu/packages/algebra.scm | 42 ------------------------------------------ gnu/packages/sagemath.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 42 deletions(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index edcfad1402..95189401f7 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1333,48 +1333,6 @@ multiplication algorithm.") (license license:gpl2+) (home-page "https://bitbucket.org/malb/m4ri/"))) -(define-public ratpoints - (package - (name "ratpoints") - (version "2.1.3") - (source (origin - (method url-fetch) - (uri (string-append - "http://www.mathe2.uni-bayreuth.de/stoll/programs/" - "ratpoints-" version ".tar.gz")) - (sha256 - (base32 - "0zhad84sfds7izyksbqjmwpfw4rvyqk63yzdjd3ysd32zss5bgf4")) - (patches - ;; Taken from - ;; - (search-patches "ratpoints-sturm_and_rp_private.patch")))) - (build-system gnu-build-system) - (arguments - `(#:test-target "test" - #:make-flags - (list (string-append "INSTALL_DIR=" (assoc-ref %outputs "out")) - "CCFLAGS=-fPIC") - #:phases - (modify-phases %standard-phases - (delete 'configure) ;no configure script - (add-before 'install 'create-install-directories - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p out) - (with-directory-excursion out - (for-each (lambda (d) (mkdir-p d)) - '("bin" "include" "lib")))) - #t))))) - (inputs - `(("gmp" ,gmp))) - (home-page "http://www.mathe2.uni-bayreuth.de/stoll/programs/") - (synopsis "Find rational points on hyperelliptic curves") - (description "Ratpoints tries to find all rational points within -a given height bound on a hyperelliptic curve in a very efficient way, -by using an optimized quadratic sieve algorithm.") - (license license:gpl2+))) - (define-public symmetrica (package (name "symmetrica") diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index d264eb560f..43da5c636a 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Andreas Enge +;;; Copyright © 2019 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -429,3 +430,45 @@ used as internal storage type for polynomial structures.") zeta function and its twists by quadratic characters.") (license license:gpl2+) (home-page "https://gitlab.com/sagemath/sage"))) + +(define-public ratpoints + (package + (name "ratpoints") + (version "2.1.3") + (source (origin + (method url-fetch) + (uri (string-append + "http://www.mathe2.uni-bayreuth.de/stoll/programs/" + "ratpoints-" version ".tar.gz")) + (sha256 + (base32 + "0zhad84sfds7izyksbqjmwpfw4rvyqk63yzdjd3ysd32zss5bgf4")) + (patches + ;; Taken from + ;; + (search-patches "ratpoints-sturm_and_rp_private.patch")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:make-flags + (list (string-append "INSTALL_DIR=" (assoc-ref %outputs "out")) + "CCFLAGS=-fPIC") + #:phases + (modify-phases %standard-phases + (delete 'configure) ;no configure script + (add-before 'install 'create-install-directories + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p out) + (with-directory-excursion out + (for-each (lambda (d) (mkdir-p d)) + '("bin" "include" "lib")))) + #t))))) + (inputs + `(("gmp" ,gmp))) + (home-page "http://www.mathe2.uni-bayreuth.de/stoll/programs/") + (synopsis "Find rational points on hyperelliptic curves") + (description "Ratpoints tries to find all rational points within +a given height bound on a hyperelliptic curve in a very efficient way, +by using an optimized quadratic sieve algorithm.") + (license license:gpl2+))) -- cgit v1.2.3