Attachment 896538 Details for Bug 1098680 – Patch

[patch] Patch

0001-Add-patch-to-correctly-link-shared-libraries.patch (text/plain), 4.86 KB, created by Sandro Mani on 2014-05-17 01:55:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sandro Mani

Created: 2014-05-17 01:55:56 UTC

Size: 4.86 KB

patch

obsolete

>From 3ecad9a9b9747665eaebfb841aa6f82de3a0ab51 Mon Sep 17 00:00:00 2001
>From: Sandro Mani <manisandro@gmail.com>
>Date: Sat, 17 May 2014 03:54:53 +0200
>Subject: [PATCH] Add patch to correctly link shared libraries
>
>---
> scotch-Makefile.shared.inc.in |  1 +
> scotch-Makefile.static.inc.in |  1 +
> scotch.spec                   |  7 +++++-
> scotch_ldflags.patch          | 53 +++++++++++++++++++++++++++++++++++++++++++
> 4 files changed, 61 insertions(+), 1 deletion(-)
> create mode 100644 scotch_ldflags.patch
>
>diff --git a/scotch-Makefile.shared.inc.in b/scotch-Makefile.shared.inc.in
>index 5bb5083..9e39cef 100644
>--- a/scotch-Makefile.shared.inc.in
>+++ b/scotch-Makefile.shared.inc.in
>@@ -15,6 +15,7 @@ CFLAGS		= @RPMFLAGS@ \
> 		-Drestrict=__restrict -DIDXSIZE64
> CLIBFLAGS	= -shared -fPIC
> LDFLAGS		= -lz -lbz2 -llzmadec -lm -lrt  -lpthread
>+DYNLDFLAGS	= $(LDFLAGS)
> CP		= cp -av
> LEX		= flex
> LN		= ln
>diff --git a/scotch-Makefile.static.inc.in b/scotch-Makefile.static.inc.in
>index 90ca17f..e956754 100644
>--- a/scotch-Makefile.static.inc.in
>+++ b/scotch-Makefile.static.inc.in
>@@ -15,6 +15,7 @@ CFLAGS		= @RPMFLAGS@ \
> 		-Drestrict=__restrict -DIDXSIZE64
> CLIBFLAGS	=
> LDFLAGS		= -lz -lbz2 -llzmadec -lm -lrt  -lpthread
>+DYNLDFLAGS	=
> CP		= cp -av
> LEX		= flex
> LN		= ln
>diff --git a/scotch.spec b/scotch.spec
>index 3113e53..3528057 100644
>--- a/scotch.spec
>+++ b/scotch.spec
>@@ -1,13 +1,14 @@
> Summary:	Graph, mesh and hypergraph partitioning library
> Name:		scotch
> Version:	6.0.0
>-Release:	5%{?dist}
>+Release:	6%{?dist}
> License:	CeCILL-C
> Group:		Development/Libraries
> URL:		http://www.labri.fr/perso/pelegrin/scotch/
> Source0:	https://gforge.inria.fr/frs/download.php/27583/%{name}_%{version}.tar.gz
> Source1:	scotch-Makefile.static.inc.in
> Source2:	scotch-Makefile.shared.inc.in
>+Patch0:		scotch_ldflags.patch
> BuildRequires:	flex bison zlib-devel bzip2-devel lzma-devel
> Requires:	%{name}-doc = %{version}-%{release}
> 
>@@ -100,6 +101,7 @@ This package contains static libraries for Scotch, compiled against openmpi.
> %prep
> %setup -c -q -n scotch_%{version}
> pushd scotch_%{version}
>+%patch0 -p1
> sed s/@RPMFLAGS@/'%{optflags} -fPIC'/ < %SOURCE1 > src/Makefile.static.inc
> sed s/@RPMFLAGS@/'%{optflags} -fPIC'/ < %SOURCE2 > src/Makefile.shared.inc
> popd
>@@ -288,6 +290,9 @@ popd
> %doc scotch_%{version}/README.txt scotch_%{version}/doc/*
> 
> %changelog
>+* Sat May 17 2014 Sandro Mani <manisandro@gmail.com> - 6.0.0-6
>+- Add patch to correctly link shared libraries
>+
> * Thu Feb 27 2014 Deji Akingunola <dakingun@gmail.com> - 6.0.0-5
> - Slightly modified Erik Zeek spec re-write (See 2012-10-08 below)
> - Rename mpich and openmpi subpackages as ptscotch-(mpich/openmpi) (Laurence Mcglashan)
>diff --git a/scotch_ldflags.patch b/scotch_ldflags.patch
>new file mode 100644
>index 0000000..0b4ccf3
>--- /dev/null
>+++ b/scotch_ldflags.patch
>@@ -0,0 +1,53 @@
>+diff -rupN scotch_6.0.0/src/libscotch/Makefile scotch_6.0.0-new/src/libscotch/Makefile
>+--- scotch_6.0.0/src/libscotch/Makefile	2012-12-01 12:16:06.000000000 +0100
>++++ scotch_6.0.0-new/src/libscotch/Makefile	2014-05-17 03:36:36.047529679 +0200
>+@@ -2934,25 +2934,25 @@ ptscotchf.h			:	ptdummysizes$(EXE)			\
>+ 					./ptdummysizes$(EXE) library_pt_f.h ptscotchf.h
>+ 
>+ libscotch$(LIB)			:	$(LIBSCOTCHDEPS)
>+-					$(AR) $(ARFLAGS) $(@) $(?)
>++					$(AR) $(ARFLAGS) $(@) $(?) $(DYNLDFLAGS)
>+ 					-$(RANLIB) $(@)
>+ 
>+ libscotcherr$(LIB)		:	library_error$(OBJ)
>+-					$(AR) $(ARFLAGS) $(@) $(?)
>++					$(AR) $(ARFLAGS) $(@) $(?) $(DYNLDFLAGS)
>+ 					-$(RANLIB) $(@)
>+ 
>+ libscotcherrexit$(LIB)		:	library_error_exit$(OBJ)
>+-					$(AR) $(ARFLAGS) $(@) $(?)
>++					$(AR) $(ARFLAGS) $(@) $(?) $(DYNLDFLAGS)
>+ 					-$(RANLIB) $(@)
>+ 
>+ libptscotch$(LIB)		:	$(LIBPTSCOTCHDEPS)
>+-					$(AR) $(ARFLAGS) $(@) $(?)
>++					$(AR) $(ARFLAGS) $(@) $(?) $(DYNLDFLAGS)
>+ 					-$(RANLIB) $(@)
>+ 
>+ libptscotcherr$(LIB)		:	library_error_pt$(OBJ)
>+-					$(AR) $(ARFLAGS) $(@) $(?)
>++					$(AR) $(ARFLAGS) $(@) $(?) $(DYNLDFLAGS)
>+ 					-$(RANLIB) $(@)
>+ 
>+ libptscotcherrexit$(LIB)	:	library_error_exit_pt$(OBJ)
>+-					$(AR) $(ARFLAGS) $(@) $(?)
>++					$(AR) $(ARFLAGS) $(@) $(?) $(DYNLDFLAGS)
>+ 					-$(RANLIB) $(@)
>+diff -rupN scotch_6.0.0/src/libscotchmetis/Makefile scotch_6.0.0-new/src/libscotchmetis/Makefile
>+--- scotch_6.0.0/src/libscotchmetis/Makefile	2011-09-06 18:46:48.000000000 +0200
>++++ scotch_6.0.0-new/src/libscotchmetis/Makefile	2014-05-17 03:36:07.705918097 +0200
>+@@ -129,12 +129,12 @@ libptscotchparmetis$(LIB)	:	parmetis_dgr
>+ 					parmetis_dgraph_order_f$(OBJ)		\
>+ 					parmetis_dgraph_part$(OBJ)		\
>+ 					parmetis_dgraph_part_f$(OBJ)
>+-					$(AR) $(ARFLAGS) $(@) $(^)
>++					$(AR) $(ARFLAGS) $(@) $(^) $(DYNLDFLAGS)
>+ 					-$(RANLIB) $(@)
>+ 
>+ libscotchmetis$(LIB)		:	metis_graph_order$(OBJ)			\
>+ 					metis_graph_order_f$(OBJ)		\
>+ 					metis_graph_part$(OBJ)			\
>+ 					metis_graph_part_f$(OBJ)
>+-					$(AR) $(ARFLAGS) $(@) $(^)
>++					$(AR) $(ARFLAGS) $(@) $(^) $(DYNLDFLAGS)
>+ 					-$(RANLIB) $(@)
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1098680: 896538