From mboxrd@z Thu Jan 1 00:00:00 1970 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 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-Message-ID: Date: Fri, 22 Feb 2019 14:27:37 +0200 From: Efraim Flashner Message-ID: <20190222122736.GA18280@macbook41> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="H+4ONPRPur6+Ovig" Content-Disposition: inline List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 34615@debbugs.gnu.org --H+4ONPRPur6+Ovig Content-Type: multipart/mixed; boundary="ReaqsoxgOBHFXBhH" Content-Disposition: inline --ReaqsoxgOBHFXBhH Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Looks like I sent the email and forgot to add the patch to the package definition patch. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --ReaqsoxgOBHFXBhH Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-Add-libtommath.patch" Content-Transfer-Encoding: quoted-printable =46rom 11dc41593f353e8bf55c9403182690c7adc49556 Mon Sep 17 00:00:00 2001 =46rom: Efraim Flashner Date: Fri, 22 Feb 2019 14:18:10 +0200 Subject: [PATCH] gnu: Add libtommath. * gnu/packages/algebra.scm (libtommath): New variable. * gnu/packages/patches/libtommath.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/algebra.scm | 47 +++++++++++++++- .../patches/libtommath-fix-linkage.patch | 55 +++++++++++++++++++ 3 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libtommath-fix-linkage.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 =3D \ %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 =C2=A9 2016, 2017, 2018, 2019 Nicolas Goaziou ;;; Copyright =C2=A9 2014, 2018 Mark H Weaver ;;; Copyright =C2=A9 2016, 2018, 2019 Ricardo Wurmus -;;; Copyright =C2=A9 2017 Efraim Flashner +;;; Copyright =C2=A9 2017, 2019 Efraim Flashner ;;; Copyright =C2=A9 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2017 Marius Bakke ;;; Copyright =C2=A9 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-flag= s)))) + #:make-flags (list (string-append "PREFIX=3D" (assoc-ref %outputs "= out")) + "CC=3Dgcc"))) + (native-inputs + `(("libtool" ,libtool))) + (home-page "https://www.libtom.net/LibTomMath/") + (synopsis "portable number theoretic multiple-precision integer librar= y") + (description "LibTomMath is a portable number theoretic multiple-preci= sion +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/packag= es/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/93dea3a4162527346cd8856bfda6f1= 7ffe98ab04.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 =3D $(LIBTOOL) --mode=3Dcompile --tag=3DCC $(CC) ++LTLINK =3D $(LIBTOOL) --mode=3Dlink --tag=3DCC $(CC) +=20 + LCOV_ARGS=3D--directory .libs --directory . +=20 +@@ -59,7 +60,7 @@ objs: $(OBJECTS) + LOBJECTS =3D $(OBJECTS:.o=3D.lo) +=20 + $(LIBNAME): $(OBJECTS) +- $(LIBTOOL) --mode=3Dlink --tag=3DCC $(CC) $(LDFLAGS) $(LOBJECTS) -o $(LI= BNAME) -rpath $(LIBPATH) -version-info $(VERSION_SO) $(LIBTOOLFLAGS) ++ $(LTLINK) $(LDFLAGS) $(LOBJECTS) -o $(LIBNAME) -rpath $(LIBPATH) -versio= n-info $(VERSION_SO) $(LIBTOOLFLAGS) +=20 + install: $(LIBNAME) + install -d $(DESTDIR)$(LIBPATH) +@@ -76,16 +77,16 @@ uninstall: + rm $(DESTDIR)$(LIBPATH)/pkgconfig/libtommath.pc +=20 + test: $(LIBNAME) demo/demo.o +- $(CC) $(CFLAGS) -c demo/demo.c -o demo/demo.o +- $(LIBTOOL) --mode=3Dlink $(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) +=20 + test_standalone: $(LIBNAME) demo/demo.o +- $(CC) $(CFLAGS) -c demo/demo.c -o demo/demo.o +- $(LIBTOOL) --mode=3Dlink $(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) +=20 + .PHONY: mtest + mtest: +- cd mtest ; $(CC) $(CFLAGS) $(LDFLAGS) mtest.c -o mtest ++ cd mtest ; $(CC) $(CFLAGS) -O0 mtest.c $(LDFLAGS) -o mtest +=20 + timing: $(LIBNAME) demo/timing.c +- $(LIBTOOL) --mode=3Dlink $(CC) $(CFLAGS) $(LDFLAGS) -DTIMER demo/timing.= c $(LIBNAME) -o timing ++ $(LTLINK) $(CFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME) -o timing --=20 2.20.1 --ReaqsoxgOBHFXBhH-- --H+4ONPRPur6+Ovig Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAlxv6rgACgkQQarn3Mo9 g1G12w/+L+xNn6ZQW+u/RSbW3oIn4ei6ivBL0jtM4AxmrQBdUNtLAu8xiQ4RWjyF Bf/bh+fnDTAKPwI1JwMNYBB1Jlu35C3Kkvd/cUQmmSg4GO5vUY/gc5EBazD39TSW 2OPH/chWbSUPYZhRbzQr8+yA3jH2qhStMubZ1+v68VbHJSOCjyMZNse1iOC3wxTb 7LnOoAinLlGRplUxKvfezwGytCi5uVYe3Um1h/rfvwknox3K18hcUbafsTwct1nB pvsnSiBdPXMtFjgirYmsxccTw6Na0kHAWszMvo3Pb11edzaRRjPSGh1yrd2OYbDy /BsB9ice9Rcf0ZnPE+8GPvEaASoeC7ZBa4m9glGSjd4Il4YAsBWhqrSiabAbl6Fh 1GfFDTaKmoKrUIsnAuMuV01UctJ4KOOXTyf7FxQii9TseDUATlnAbryxqdTn7QYr dUYgr4nFbyU/i8ZT2ilBsjkeApWZF1yRLpp9ozPCfCaX2al8klOEr6aGAjb78RnT kMMet61x7Cb7Ej0mSo39flGIliCmGxEiJ46zif1zGMtANT6zsv7OA+pOwLgUeFS3 ZWgeAunPla5w+T6hEtA25DqdJWAdPhLDRoJawUT7dhxhErlhPEIGgobd5BqRJTv2 NuHGiaGxPfZpy7mBW0d96EoNJTp+0PzWT9+KU1Ak2cTuQEKM9K8= =Gl3s -----END PGP SIGNATURE----- --H+4ONPRPur6+Ovig--