From patchwork Mon Jun 8 11:05:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Maja_K=C4=85dzio=C5=82ka?= X-Patchwork-Id: 22607 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 858BE27BBE3; Mon, 8 Jun 2020 12:07:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 1705127BBE1 for ; Mon, 8 Jun 2020 12:07:11 +0100 (BST) Received: from localhost ([::1]:56192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jiFcU-0002Qc-Li for patchwork@mira.cbaines.net; Mon, 08 Jun 2020 07:07:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jiFcM-0002QJ-U7 for guix-patches@gnu.org; Mon, 08 Jun 2020 07:07:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44455) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jiFcM-0006ol-KV for guix-patches@gnu.org; Mon, 08 Jun 2020 07:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jiFcM-00051h-FP for guix-patches@gnu.org; Mon, 08 Jun 2020 07:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40283] [PATCH v2 1/3] gnu: flint: Update to 2.6.0. References: <20200329203224.27052-1-kuba@kadziolka.net> In-Reply-To: <20200329203224.27052-1-kuba@kadziolka.net> Resent-From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jun 2020 11:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40283 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40283@debbugs.gnu.org Cc: mbakke@fastmail.com Received: via spool by 40283-submit@debbugs.gnu.org id=B40283.159161436319232 (code B ref 40283); Mon, 08 Jun 2020 11:07:02 +0000 Received: (at 40283) by debbugs.gnu.org; 8 Jun 2020 11:06:03 +0000 Received: from localhost ([127.0.0.1]:55996 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jiFbO-000507-Hb for submit@debbugs.gnu.org; Mon, 08 Jun 2020 07:06:02 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:38658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jiFbI-0004zC-Ve for 40283@debbugs.gnu.org; Mon, 08 Jun 2020 07:06:01 -0400 Received: (qmail 16041 invoked by uid 1009); 8 Jun 2020 13:05:55 +0200 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25836. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.053433 secs); 08 Jun 2020 11:05:55 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 8 Jun 2020 13:05:55 +0200 From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Date: Mon, 8 Jun 2020 13:05:48 +0200 Message-Id: <20200608110550.16488-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Qmailux-2.08st: added fake Content-Type header X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 * gnu/packages/algebra.scm (flint): Update to 2.6.0. * gnu/packages/patches/flint-ldconfig.patch: Remove the patch as it got applied upstream. * gnu/local.mk (dist_patch_DATA): Deregister the removed file. --- gnu/local.mk | 1 - gnu/packages/algebra.scm | 5 ++--- gnu/packages/patches/flint-ldconfig.patch | 26 ----------------------- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 gnu/packages/patches/flint-ldconfig.patch diff --git a/gnu/local.mk b/gnu/local.mk index ae8a2275f7..27e96ea77b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -921,7 +921,6 @@ dist_patch_DATA = \ %D%/packages/patches/findutils-localstatedir.patch \ %D%/packages/patches/findutils-test-rwlock-threads.patch \ %D%/packages/patches/flann-cmake-3.11.patch \ - %D%/packages/patches/flint-ldconfig.patch \ %D%/packages/patches/foobillard++-pkg-config.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \ diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 1008d24cd3..4559293a03 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -438,15 +438,14 @@ or text interfaces) or as a C++ library.") (define-public flint (package (name "flint") - (version "2.5.2") + (version "2.6.0") (source (origin (method url-fetch) (uri (string-append "http://flintlib.org/flint-" version ".tar.gz")) (sha256 (base32 - "11syazv1a8rrnac3wj3hnyhhflpqcmq02q8pqk2m6g2k6h0gxwfb")) - (patches (search-patches "flint-ldconfig.patch")))) + "0h08a71kn8347zsqjamqnmrxjpsnnzpmhvxb6d2xmfrcs6nyv2ch")))) (build-system gnu-build-system) (propagated-inputs `(("gmp" ,gmp) diff --git a/gnu/packages/patches/flint-ldconfig.patch b/gnu/packages/patches/flint-ldconfig.patch deleted file mode 100644 index d7c66e17ab..0000000000 --- a/gnu/packages/patches/flint-ldconfig.patch +++ /dev/null @@ -1,26 +0,0 @@ -Patch by Andreas Enge . -Remedy the absence of ldconfig and explicitly create an additional symbolic -link to the flint library, as discussed privately with upstream. - -diff -r -u flint-2.5.2.orig/configure flint-2.5.2/configure ---- flint-2.5.2.orig/configure 2015-08-13 18:16:22.000000000 +0200 -+++ flint-2.5.2/configure 2015-08-14 17:38:14.316284437 +0200 -@@ -714,6 +714,7 @@ - echo "FLINT_SHARED=$SHARED" >> Makefile - echo "FLINT_LIB=$FLINT_LIB" >> Makefile - echo "FLINT_LIBNAME=$FLINT_LIBNAME" >> Makefile -+echo "FLINT_MAJOR=$FLINT_MAJOR" >> Makefile - echo "FLINT_SOLIB=$FLINT_SOLIB" >> Makefile - echo "EXEEXT=$EXEEXT" >> Makefile - echo "PREFIX=$PREFIX" >> Makefile -diff -r -u flint-2.5.2.orig/Makefile.in flint-2.5.2/Makefile.in ---- flint-2.5.2.orig/Makefile.in 2015-08-13 18:16:22.000000000 +0200 -+++ flint-2.5.2/Makefile.in 2015-08-14 17:38:50.584774817 +0200 -@@ -118,6 +118,7 @@ - $(LDCONFIG) -n "$(CURDIR)"; \ - fi - ln -sf "$(FLINT_LIB)" "$(FLINT_LIBNAME)"; \ -+ ln -sf "$(FLINT_LIB)" "$(FLINT_LIBNAME).$(FLINT_MAJOR)"; \ - - libflint.a: $(OBJS) $(LIB_SOURCES) $(EXT_SOURCES) $(HEADERS) $(EXT_HEADERS) | build build/interfaces - $(AT)$(foreach ext, $(EXTENSIONS), $(foreach dir, $(filter-out %templates, $(patsubst $(ext)/%.h, %, $(wildcard $(ext)/*.h))), mkdir -p build/$(dir); BUILD_DIR=$(CURDIR)/build/$(dir); export BUILD_DIR; MOD_DIR=$(dir); export MOD_DIR; $(MAKE) -f $(CURDIR)/Makefile.subdirs -C $(ext)/$(dir) static || exit $$?;))