From patchwork Fri Feb 22 12:27:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 1219 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 372EE16C44; Fri, 22 Feb 2019 12:28:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id B21CE16C20 for ; Fri, 22 Feb 2019 12:28:12 +0000 (GMT) Received: from localhost ([127.0.0.1]:49527 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gx9w4-0006Is-2Q for patchwork@mira.cbaines.net; Fri, 22 Feb 2019 07:28:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gx9vy-0006In-2Z for guix-patches@gnu.org; Fri, 22 Feb 2019 07:28:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gx9vv-0000UR-H1 for guix-patches@gnu.org; Fri, 22 Feb 2019 07:28:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34097) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gx9vu-0000SA-1e for guix-patches@gnu.org; Fri, 22 Feb 2019 07:28:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gx9vt-0000Wb-Sq for guix-patches@gnu.org; Fri, 22 Feb 2019 07:28:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34615] [PATCH] gnu: Add libtommath. References: <20190222122014.21600-1-efraim@flashner.co.il> In-Reply-To: <20190222122014.21600-1-efraim@flashner.co.il> Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Feb 2019 12:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34615 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34615@debbugs.gnu.org Received: via spool by 34615-submit@debbugs.gnu.org id=B34615.15508384782007 (code B ref 34615); Fri, 22 Feb 2019 12:28:01 +0000 Received: (at 34615) by debbugs.gnu.org; 22 Feb 2019 12:27:58 +0000 Received: from localhost ([127.0.0.1]:47641 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gx9vh-0000W8-1S for submit@debbugs.gnu.org; Fri, 22 Feb 2019 07:27:58 -0500 Received: from flashner.co.il ([178.62.234.194]:42956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gx9vc-0000Vq-7P for 34615@debbugs.gnu.org; Fri, 22 Feb 2019 07:27:47 -0500 Received: from localhost (unknown [188.120.128.87]) by flashner.co.il (Postfix) with ESMTPSA id 2E3C640027 for <34615@debbugs.gnu.org>; Fri, 22 Feb 2019 12:27:38 +0000 (UTC) Date: Fri, 22 Feb 2019 14:27:37 +0200 From: Efraim Flashner Message-ID: <20190222122736.GA18280@macbook41> MIME-Version: 1.0 Content-Disposition: inline X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 User-Agent: Mutt/1.11.2 (2019-01-07) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Looks like I sent the email and forgot to add the patch to the package definition patch. diff --git a/gnu/local.mk b/gnu/local.mk index faebff2e5d..73472fdc50 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -993,6 +993,7 @@ dist_patch_DATA = \ %D%/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch \ %D%/packages/patches/libtar-CVE-2013-4420.patch \ %D%/packages/patches/libtheora-config-guess.patch \ + %D%/packages/patches/libtommath-fix-linkage.patch \ %D%/packages/patches/libtool-skip-tests2.patch \ %D%/packages/patches/libusb-0.1-disable-tests.patch \ %D%/packages/patches/libusb-for-axoloti.patch \ diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index f9ae22b3f3..98dc414ac5 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019 Nicolas Goaziou ;;; Copyright © 2014, 2018 Mark H Weaver ;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2019 Efraim Flashner ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2019 Eric Bavier @@ -1000,3 +1000,48 @@ objects.") ;; means that the gpl2+ licence of GAP itself applies, but to be on the ;; safe side, we drop them for now. (license license:gpl2+))) + +(define-public libtommath + (package + (name "libtommath") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/libtom/libtommath/releases/" + "download/v" version "/ltm-" version ".tar.xz")) + (sha256 + (base32 + "1bbyagqzfdbg37k1n08nsqzdf44z8zsnjjinqbsyj7rxg246qilh")) + (patches (search-patches "libtommath-fix-linkage.patch")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure + (add-after 'unpack 'prepare-build + (lambda _ + ;; Don't pull in coreutils. + (substitute* "makefile_include.mk" + (("arch") "uname -m")) + (delete-file "makefile") + (symlink "makefile.shared" "makefile") + #t)) + (replace 'check + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "test_standalone" make-flags) + (invoke "sh" "test"))) + (add-after 'check 'make-static + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "-f" "makefile.unix" "install" make-flags)))) + #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + "CC=gcc"))) + (native-inputs + `(("libtool" ,libtool))) + (home-page "https://www.libtom.net/LibTomMath/") + (synopsis "portable number theoretic multiple-precision integer library") + (description "LibTomMath is a portable number theoretic multiple-precision +integer library written entirely in C. The library is designed to provide a +simple to work with API that provides fairly efficient routines that build out +of the box without configuration.") + (license license:unlicense))) diff --git a/gnu/packages/patches/libtommath-fix-linkage.patch b/gnu/packages/patches/libtommath-fix-linkage.patch new file mode 100644 index 0000000000..1a9d46eb7c --- /dev/null +++ b/gnu/packages/patches/libtommath-fix-linkage.patch @@ -0,0 +1,55 @@ +https://github.com/libtom/libtommath/commit/93dea3a4162527346cd8856bfda6f17ffe98ab04.patch + +From 93dea3a4162527346cd8856bfda6f17ffe98ab04 Mon Sep 17 00:00:00 2001 +From: Steffen Jaeckel +Date: Thu, 31 Jan 2019 14:12:03 +0100 +Subject: [PATCH] makefile.shared: fix compilation and linkage + +--- + makefile.shared | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/makefile.shared b/makefile.shared +index 3955f830..870b18d1 100644 +--- a/makefile.shared ++++ b/makefile.shared +@@ -18,6 +18,7 @@ ifndef LIBTOOL + endif + endif + LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) ++LTLINK = $(LIBTOOL) --mode=link --tag=CC $(CC) + + LCOV_ARGS=--directory .libs --directory . + +@@ -59,7 +60,7 @@ objs: $(OBJECTS) + LOBJECTS = $(OBJECTS:.o=.lo) + + $(LIBNAME): $(OBJECTS) +- $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) $(LOBJECTS) -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION_SO) $(LIBTOOLFLAGS) ++ $(LTLINK) $(LDFLAGS) $(LOBJECTS) -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION_SO) $(LIBTOOLFLAGS) + + install: $(LIBNAME) + install -d $(DESTDIR)$(LIBPATH) +@@ -76,16 +77,16 @@ uninstall: + rm $(DESTDIR)$(LIBPATH)/pkgconfig/libtommath.pc + + test: $(LIBNAME) demo/demo.o +- $(CC) $(CFLAGS) -c demo/demo.c -o demo/demo.o +- $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o test demo/demo.o $(LIBNAME) ++ $(LTCOMPILE) $(CFLAGS) -c demo/demo.c -o demo/demo.o ++ $(LTLINK) $(LDFLAGS) -o test demo/demo.o $(LIBNAME) + + test_standalone: $(LIBNAME) demo/demo.o +- $(CC) $(CFLAGS) -c demo/demo.c -o demo/demo.o +- $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o test demo/demo.o $(LIBNAME) ++ $(LTCOMPILE) $(CFLAGS) -c demo/demo.c -o demo/demo.o ++ $(LTLINK) $(LDFLAGS) -o test demo/demo.o $(LIBNAME) + + .PHONY: mtest + mtest: +- cd mtest ; $(CC) $(CFLAGS) $(LDFLAGS) mtest.c -o mtest ++ cd mtest ; $(CC) $(CFLAGS) -O0 mtest.c $(LDFLAGS) -o mtest + + timing: $(LIBNAME) demo/timing.c +- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME) -o timing ++ $(LTLINK) $(CFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME) -o timing