From patchwork Thu Feb 13 14:08:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Maurice_Br=C3=A9mond?= X-Patchwork-Id: 20238 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 6134127BBEA; Thu, 13 Feb 2020 14:36:17 +0000 (GMT) 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, 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 DA01627BBE4 for ; Thu, 13 Feb 2020 14:36:16 +0000 (GMT) Received: from localhost ([::1]:53310 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2FbD-0000eR-9D for patchwork@mira.cbaines.net; Thu, 13 Feb 2020 09:36:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58893) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2Fb2-0000c6-Q4 for guix-patches@gnu.org; Thu, 13 Feb 2020 09:36:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2Fb1-0004EX-DP for guix-patches@gnu.org; Thu, 13 Feb 2020 09:36:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53503) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j2Fb1-0004D9-9L for guix-patches@gnu.org; Thu, 13 Feb 2020 09:36:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j2Fb1-0006hH-6z for guix-patches@gnu.org; Thu, 13 Feb 2020 09:36:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39589] mumps: fix bad version in the names of *.so files Resent-From: Maurice =?utf-8?q?Br=C3=A9mond?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Feb 2020 14:36:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39589 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 39589@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158160450425647 (code B ref -1); Thu, 13 Feb 2020 14:36:03 +0000 Received: (at submit) by debbugs.gnu.org; 13 Feb 2020 14:35:04 +0000 Received: from localhost ([127.0.0.1]:59474 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j2Fa3-0006fT-Dc for submit@debbugs.gnu.org; Thu, 13 Feb 2020 09:35:04 -0500 Received: from lists.gnu.org ([209.51.188.17]:46054) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j2FAS-00062b-N1 for submit@debbugs.gnu.org; Thu, 13 Feb 2020 09:08:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53919) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2FAR-0000BY-I8 for guix-patches@gnu.org; Thu, 13 Feb 2020 09:08:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2FAQ-0002jx-9y for guix-patches@gnu.org; Thu, 13 Feb 2020 09:08:35 -0500 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:12181) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j2FAP-0002jQ-UX for guix-patches@gnu.org; Thu, 13 Feb 2020 09:08:34 -0500 X-IronPort-AV: E=Sophos;i="5.70,436,1574118000"; d="scan'208,223";a="339077642" Received: from bremondm.imag.fr (HELO maurice-HP-ZBook-15-G3.inria.fr) ([129.88.37.91]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/AES256-GCM-SHA384; 13 Feb 2020 15:08:31 +0100 From: Maurice =?utf-8?q?Br=C3=A9mond?= Date: Thu, 13 Feb 2020 15:08:30 +0100 Message-ID: <8736ber34x.fsf@inria.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1.50 (gnu/linux) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Mailman-Approved-At: Thu, 13 Feb 2020 09:35:00 -0500 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: , Reply-To: Maurice =?utf-8?q?Br=C3=A9mond?= Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, For the mumps package, the version in the names of the *.so files was kept to the old one : 5.1.2. This is my mistake. This patch change it to 5.2.1 From 25bc70a04ae362009547ae8b0c648f500268f9a8 Mon Sep 17 00:00:00 2001 From: Maurice Bremond Date: Thu, 13 Feb 2020 11:50:55 +0100 Subject: [PATCH] gnu: mumps fix 5.1.2 -> 5.2.1 for lib files --- gnu/packages/maths.scm | 2 +- gnu/packages/patches/shared-libseq.patch | 2 +- gnu/packages/patches/shared-mumps.patch | 8 ++++---- gnu/packages/patches/shared-pord.patch | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 8e44233fb4..c255ac65b5 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2294,7 +2294,7 @@ IORDERINGSC = $(IPORD) $(IMETIS) $(ISCOTCH)" (copy-recursively "lib" libdir) (every (lambda (prec) - (augment-rpath (string-append libdir "/lib" prec "mumps-5.1.2.so") libdir)) + (augment-rpath (string-append libdir "/lib" prec "mumps-5.2.1.so") libdir)) '("s" "d" "c" "z")) (augment-rpath (string-append libdir "/libmumps_common.so") libdir) (copy-recursively "include" (string-append out "/include")) diff --git a/gnu/packages/patches/shared-libseq.patch b/gnu/packages/patches/shared-libseq.patch index feafcf123b..eccf528f7a 100644 --- a/gnu/packages/patches/shared-libseq.patch +++ b/gnu/packages/patches/shared-libseq.patch @@ -17,7 +17,7 @@ Index: mumps/libseq/Makefile + $(AR) $@ mpi.o mpic.o elapse.o $(RANLIB) $@ +libmpiseq$(PLAT).so: mpi.o mpic.o elapse.o -+ $(FC) -shared $^ -Wl,-soname,libmpiseq$(PLAT)-5.1.2.so -o libmpiseq$(PLAT)-5.1.2.so -Wl,-z,defs ++ $(FC) -shared $^ -Wl,-soname,libmpiseq$(PLAT)-5.2.1.so -o libmpiseq$(PLAT)-5.2.1.so -Wl,-z,defs .f.o: - $(FC) $(OPTF) -c $*.f $(OUTF)$*.o + $(FC) $(OPTF) -fPIC -c $*.f $(OUTF)$*.o diff --git a/gnu/packages/patches/shared-mumps.patch b/gnu/packages/patches/shared-mumps.patch index 9e2491f300..d94ccf6ce9 100644 --- a/gnu/packages/patches/shared-mumps.patch +++ b/gnu/packages/patches/shared-mumps.patch @@ -30,16 +30,16 @@ Index: mumps/src/Makefile -$(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT): $(OBJS_MOD) $(OBJS_OTHER) - $(AR)$@ $? +$(libdir)/libmumps_common$(PLAT).so: $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER) -+ $(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-5.1.2.so -L$(libdir) $(LORDERINGS) -lpthread $(MPIFLIB) $(MPICLIB) $(LEXTRAS) -o $(libdir)/libmumps_common$(PLAT)-5.1.2.so -Wl,-z,defs -+ ln -s libmumps_common$(PLAT)-5.1.2.so $@ ++ $(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-5.2.1.so -L$(libdir) $(LORDERINGS) -lpthread $(MPIFLIB) $(MPICLIB) $(LEXTRAS) -o $(libdir)/libmumps_common$(PLAT)-5.2.1.so -Wl,-z,defs ++ ln -s libmumps_common$(PLAT)-5.2.1.so $@ + +$(libdir)/lib$(ARITH)mumps$(PLAT).a: $(OBJS_MOD) $(OBJS_OTHER) + $(AR) $@ $? $(RANLIB) $@ +$(libdir)/lib$(ARITH)mumps$(PLAT).so: $(OBJS_MOD) $(OBJS_OTHER) -+ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-5.1.2.so -L$(libdir) -lmumps_common$(PLAT) $(LORDERINGS) $(MPIFLIB) $(LEXTRAS) $(LIBBLAS) $(SCALAP) $(LAPACK) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-5.1.2.so -Wl,-z,defs -+ ln -s lib$(ARITH)mumps$(PLAT)-5.1.2.so $@ ++ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-5.2.1.so -L$(libdir) -lmumps_common$(PLAT) $(LORDERINGS) $(MPIFLIB) $(LEXTRAS) $(LIBBLAS) $(SCALAP) $(LAPACK) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-5.2.1.so -Wl,-z,defs ++ ln -s lib$(ARITH)mumps$(PLAT)-5.2.1.so $@ + # Dependencies between modules: $(ARITH)mumps_load.o: $(ARITH)mumps_comm_buffer.o \ diff --git a/gnu/packages/patches/shared-pord.patch b/gnu/packages/patches/shared-pord.patch index 48062d4f89..d3915b0ad9 100644 --- a/gnu/packages/patches/shared-pord.patch +++ b/gnu/packages/patches/shared-pord.patch @@ -24,8 +24,8 @@ Index: mumps/PORD/lib/Makefile $(RANLIB) $@ +libpord$(PLAT).so: $(OBJS) -+ $(CC) -shared $(OBJS) -Wl,-soname,libpord$(PLAT)-5.1.2.so -o libpord$(PLAT)-5.1.2.so -Wl,-z,defs -+ ln -s libpord$(PLAT)-5.1.2.so $@ ++ $(CC) -shared $(OBJS) -Wl,-soname,libpord$(PLAT)-5.2.1.so -o libpord$(PLAT)-5.2.1.so -Wl,-z,defs ++ ln -s libpord$(PLAT)-5.2.1.so $@ + clean: rm -f *.o -- 2.17.1