Attachment 160147 Details for Bug 191436 – Updated patch

[patch] Updated patch

cname.patch (text/plain), 11.78 KB, created by Orion Poplawski on 2007-07-27 22:52:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Orion Poplawski

Created: 2007-07-27 22:52:17 UTC

Size: 11.78 KB

patch

obsolete

>? cname.patch
>? openmpi-1.2.3
>? openmpi-1.2.3-4.fc8.cora.3.src.rpm
>? openmpi-1.2.3-5.fc8.src.rpm
>Index: openmpi.pc.in
>===================================================================
>RCS file: /cvs/pkgs/rpms/openmpi/devel/openmpi.pc.in,v
>retrieving revision 1.3
>diff -u -r1.3 openmpi.pc.in
>--- openmpi.pc.in	28 Jun 2007 22:06:10 -0000	1.3
>+++ openmpi.pc.in	27 Jul 2007 22:52:13 -0000
>@@ -2,6 +2,6 @@
> Name: 		@NAME@
> Description:	Open Message Passing Interface headers and libraries
> URL:		http://www.open-mpi.org/
>-Version:	@VERSION@-@CC@-@MODE@
>+Version:	@VERSION@-@CNAME@-@MODE@
> Libs:		-L@LIBDIR@/@MPIDIR@ -lmpi
> Cflags: 	-I@INCLUDEDIR@/@MPIDIR@ -I@INCLUDEDIR@/@MPIDIR@/@NAME@ -I@INCLUDEDIR@/@MPIDIR@/@MODE@ @MODEFLAG@
>Index: openmpi.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/openmpi/devel/openmpi.spec,v
>retrieving revision 1.25
>diff -u -r1.25 openmpi.spec
>--- openmpi.spec	16 Jul 2007 17:43:31 -0000	1.25
>+++ openmpi.spec	27 Jul 2007 22:52:13 -0000
>@@ -1,12 +1,12 @@
> Name:           openmpi
> Version:        1.2.3
>-Release:        4%{?dist}
>+Release:        5%{?dist}
> Summary:        Open Message Passing Interface
> 
> Group:          Development/Libraries
> License:        BSD
> URL:            http://www.open-mpi.org/
>-Source0:       	http://www.open-mpi.org/software/ompi/v1.2/downloads/%{name}-%{version}.tar.bz2
>+Source0:       	http://www.open-mpi.org/software/ompi/v1.2/downloads/openmpi-%{version}.tar.bz2
> Source1:	openmpi.pc.in
> Source2:	openmpi.module.in
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>@@ -28,7 +28,7 @@
> %package devel
> Summary:        Development files for openmpi
> Group:          Development/Libraries
>-Requires:       %{name} = %{version}-%{release}
>+Requires:       %{name}-libs = %{version}-%{release}
> Provides:	mpi-devel
> Requires(post): /usr/sbin/alternatives
> Requires(preun): /usr/sbin/alternatives
>@@ -51,9 +51,20 @@
> # We only compile with gcc, but other people may want other compilers.
> # Set the compiler here.
> %define opt_cc gcc
>-# Optional CFLAGS to use with the specific compiler...gcc doesn't need any,
>-# so uncomment and define to use
>-#define opt_cc_cflags
>+# Optional CFLAGS to use with the specific compiler...gcc uses the default
>+# rpm opt flags
>+%define opt_cflags $RPM_OPT_FLAGS
>+
>+# We only compile with gfortran, but other people may want other compilers.
>+# Set the compiler here.
>+%define opt_fc gfortran
>+# Optional FFLAGS to use with the specific compiler...gfortran uses the default
>+# rpm opt flags
>+%define opt_fflags $RPM_OPT_FLAGS
>+
>+# You'll want a cname to separate a custom built openmpi from the default
>+# version.  By default, make it the compiler vendor
>+%define cname gnu
> 
> # When dealing with multilib installations, aka the ability to run either
> # i386 or x86_64 binaries on x86_64 machines, we install the native i386
>@@ -100,10 +111,10 @@
> 
> # We set this to for convenience, since this is the unique dir we use for this
> # particular package, version, compiler
>-%define mpidir %{name}/%{version}-%{opt_cc}
>+%define mpidir openmpi/%{version}-%{cname}-%{mode}
> 
> %prep
>-%setup -q
>+%setup -q -n openmpi-%{version}
> # Kill the stack protection and fortify source stuff...it slows things down
> # and openmpi hasn't been audited for it yet
> #RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//' | sed -e 's/-fstack-protector//'`
>@@ -113,15 +124,18 @@
> %endif
> %configure \
> 	--includedir=%{_includedir}/%{mpidir} \
>-	--libdir=%{_libdir}/%{mpidir} \
>-	--datadir=%{_datadir}/%{mpidir}/help%{mode} \
>+	--libdir=%{_datadir}/%{mpidir}/lib \
>+	--datadir=%{_datadir}/%{mpidir}/help \
> 	--mandir=%{_datadir}/%{mpidir}/man \
> 	--with-libnuma=%{_libdir} \
> 	CC=%{opt_cc} \
>+	F77="%{opt_fc}" \
>+	FC="%{opt_fc}" \
> 	LDFLAGS='-Wl,-z,noexecstack' \
>-	CFLAGS="%{?opt_cc_cflags} $RPM_OPT_FLAGS $XFLAGS" \
>+	CFLAGS="%{?opt_cflags} $XFLAGS" \
> 	CXXFLAGS="$RPM_OPT_FLAGS $XFLAGS" \
>-	FFLAGS="$RPM_OPT_FLAGS $XFLAGS";
>+	FFLAGS="%{?opt_fflags} $XFLAGS" \
>+	FCFLAGS="%{?opt_fflags} $XFLAGS";
> # ${datadir}/openmpi will be used ONLY for the english help*.txt files
> 
> %build
>@@ -131,6 +145,11 @@
> rm -rf ${RPM_BUILD_ROOT}
> make install DESTDIR=${RPM_BUILD_ROOT}
> 
>+# Need to move the libraries into place and link back
>+mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/
>+mv ${RPM_BUILD_ROOT}/%{_datadir}/%{mpidir}/lib ${RPM_BUILD_ROOT}/%{_libdir}/%{mpidir}
>+ln -s ../../../../%{_lib}/%{mpidir} ${RPM_BUILD_ROOT}/%{_datadir}/%{mpidir}/lib
>+
> # Because no package owns the base openmpi directories, the install sets
> # the mode wrong.  This will cause problems when the first copy of openmpi
> # is installed on a system.  Correct the directory permissions here.
>@@ -141,40 +160,33 @@
> # Remove the symlinks from common names to the unique name in /usr/bin too
> rm ${RPM_BUILD_ROOT}%{_bindir}/mpi*
> # Move the wrapper program to a name that denotes the mode it compiles
>-mv ${RPM_BUILD_ROOT}%{_bindir}/opal_wrapper{,-%{version}-%{opt_cc}-%{mode}}
>+mv ${RPM_BUILD_ROOT}%{_bindir}/opal_wrapper{,-%{version}-%{cname}-%{mode}}
> # But, opal_wrapper needs to be called by a name that denotes the compiler
> # type in order to work, so in order to leave it functional even when it isn't
> # the currently selected system wide default via the alternatives program,
>-# make the proper symlinks from %{_datadir}/%{name}/bin to the wrapper
>-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{mpidir}/bin%{mode}
>+# make the proper symlinks from %{_datadir}/%{mpidir}/bin to the wrapper
>+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{mpidir}/bin
> for i in mpicc mpic++ mpicxx mpiCC mpif77 mpif90 ; do
>-  ln -s %{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode} \
>-  	${RPM_BUILD_ROOT}%{_datadir}/%{mpidir}/bin%{mode}/$i
>+  ln -s %{_bindir}/opal_wrapper-%{version}-%{cname}-%{mode} \
>+  	${RPM_BUILD_ROOT}%{_datadir}/%{mpidir}/bin/$i
> done
>-# The fortran include file differs between 32/64bit environments, so make
>-# two copies
>-mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/%{mpidir}/%{mode}
>-mv ${RPM_BUILD_ROOT}%{_includedir}/%{mpidir}/{mpif-config.h,%{mode}}
>-# and have the wrapper include the right one by using the wrapper-data.txt
>-# files for the fortran modes to signal the extra include dir
>-for i in ${RPM_BUILD_ROOT}%{_datadir}/%{mpidir}/help%{mode}/openmpi/mpif{77,90}-wrapper-data.txt; do
>-  sed -e 's#extra_includes=#extra_includes='%{mode}' #' < $i > $i.out
>-  mv $i.out $i
>-done
>-# and we also need to force the compile mode via the wrapper-data.txt files
>+# We need to force the compile mode via the wrapper-data.txt files
> # (except on ia64 where the -m64 flag is not allowed by gcc)
> %ifnarch ia64
>-for i in ${RPM_BUILD_ROOT}%{_datadir}/%{mpidir}/help%{mode}/openmpi/*wrapper-data.txt; do
>+for i in ${RPM_BUILD_ROOT}%{_datadir}/%{mpidir}/help/openmpi/*wrapper-data.txt; do
>   sed -e 's#compiler_flags=#compiler_flags='%{?modeflag}' #' < $i > $i.out
>   mv $i.out $i
> done
> %endif
> 
>-echo %{_libdir}/%{mpidir} > ${RPM_BUILD_ROOT}%{_libdir}/%{mpidir}/%{name}.ld.conf
>+# We need a link to orted so --prefix works
>+ln -s %{_bindir}/orted ${RPM_BUILD_ROOT}%{_datadir}/%{mpidir}/bin
>+
>+echo %{_libdir}/%{mpidir} > ${RPM_BUILD_ROOT}%{_libdir}/%{mpidir}/openmpi.ld.conf
> # Make the pkgconfig files
> mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig;
>-sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@INCLUDEDIR@#'%{_includedir}'#g;s#@MODE@#'%{mode}'#g;s#@CC@#'%{opt_cc}'#g;s#@MPIDIR@#'%{mpidir}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE1 > ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/%{name}-%{version}-%{opt_cc}-%{mode}.pc;
>-sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@INCLUDEDIR@#'%{_includedir}'#g;s#@MODE@#'%{mode}'#g;s#@CC@#'%{opt_cc}'#g;s#@MPIDIR@#'%{mpidir}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE2 > ${RPM_BUILD_ROOT}/%{_libdir}/%{mpidir}/%{name}.module;
>+sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@INCLUDEDIR@#'%{_includedir}'#g;s#@MODE@#'%{mode}'#g;s#@CNAME@#'%{cname}'#g;s#@MPIDIR@#'%{mpidir}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE1 > ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/openmpi-%{version}-%{cname}-%{mode}.pc;
>+sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@INCLUDEDIR@#'%{_includedir}'#g;s#@MODE@#'%{mode}'#g;s#@CNAME@#'%{cname}'#g;s#@MPIDIR@#'%{mpidir}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE2 > ${RPM_BUILD_ROOT}/%{_libdir}/%{mpidir}/openmpi.module;
> 
> 
> %clean
>@@ -195,31 +207,31 @@
> 
> %post libs
> alternatives --install %{_sysconfdir}/ld.so.conf.d/mpi%{mode}.conf \
>-		mpilibs%{mode} %{_libdir}/%{mpidir}/%{name}.ld.conf %{priority}
>+		mpilibs%{mode} %{_libdir}/%{mpidir}/openmpi.ld.conf %{priority}
> /sbin/ldconfig
> 
> %preun libs
>-alternatives --remove mpilibs%{mode} %{_libdir}/%{mpidir}/%{name}.ld.conf
>+alternatives --remove mpilibs%{mode} %{_libdir}/%{mpidir}/openmpi.ld.conf
> 
> %postun libs -p /sbin/ldconfig
> 
> %post devel
> alternatives --install  %{_bindir}/mpicc mpicc \
>-			%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode} \
>+			%{_bindir}/opal_wrapper-%{version}-%{cname}-%{mode} \
> 			%{priority} \
> 	--slave %{_bindir}/mpic++ mpic++ \
>-		%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode} \
>+		%{_bindir}/opal_wrapper-%{version}-%{cname}-%{mode} \
> 	--slave %{_bindir}/mpiCC mpiCC \
>-		%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode} \
>+		%{_bindir}/opal_wrapper-%{version}-%{cname}-%{mode} \
> 	--slave %{_bindir}/mpicxx mpicxx \
>-		%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode} \
>+		%{_bindir}/opal_wrapper-%{version}-%{cname}-%{mode} \
> 	--slave %{_bindir}/mpif77 mpif77 \
>-		%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode} \
>+		%{_bindir}/opal_wrapper-%{version}-%{cname}-%{mode} \
> 	--slave %{_bindir}/mpif90 mpif90 \
>-		%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode}
>+		%{_bindir}/opal_wrapper-%{version}-%{cname}-%{mode}
> 
> %preun devel
>-alternatives --remove mpicc %{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode}
>+alternatives --remove mpicc %{_bindir}/opal_wrapper-%{version}-%{cname}-%{mode}
> 
> %postun devel -p /sbin/ldconfig
> 
>@@ -232,37 +244,47 @@
> %{_bindir}/orterun
> %{_bindir}/ompi_info
> %{_datadir}/%{mpidir}/*
>-%exclude %{_datadir}/%{mpidir}/bin%{mode}
>-%exclude %{_datadir}/%{mpidir}/help%{mode}/openmpi/*-wrapper-data.txt
>+%exclude %{_datadir}/%{mpidir}/bin
>+%exclude %{_datadir}/%{mpidir}/help/openmpi/*-wrapper-data.txt
>+%exclude %{_datadir}/%{mpidir}/lib
> %exclude %{_datadir}/%{mpidir}/man/man3
> 
> %files libs
> %defattr(-,root,root,-)
> %dir %{_libdir}/%{mpidir}
>-%dir %{_libdir}/%{mpidir}/%{name}
>+%dir %{_libdir}/%{mpidir}/openmpi
> %{_libdir}/%{mpidir}/*.so.*
>-%{_libdir}/%{mpidir}/%{name}/*.so
>+%{_libdir}/%{mpidir}/openmpi/*.so
> %{_libdir}/%{mpidir}/*.conf
>+%{_datadir}/%{mpidir}/bin/orted
>+%{_datadir}/%{mpidir}/lib
> 
> %files devel
> %defattr(-,root,root,-)
>-%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode}
>+%{_bindir}/opal_wrapper-%{version}-%{cname}-%{mode}
> %dir %{_includedir}/%{mpidir}
>-%dir %{_datadir}/%{mpidir}/bin%{mode}
>+%dir %{_datadir}/%{mpidir}/bin
> %dir %{_datadir}/%{mpidir}/man/man3
>-%{_datadir}/%{mpidir}/bin%{mode}
>-%{_datadir}/%{mpidir}/help%{mode}/openmpi/*-wrapper-data.txt
>+%{_datadir}/%{mpidir}/bin/*
>+%exclude %{_datadir}/%{mpidir}/bin/orted
>+%{_datadir}/%{mpidir}/help/openmpi/*-wrapper-data.txt
> %{_includedir}/%{mpidir}/*
> %{_datadir}/%{mpidir}/man/man3/*
> %{_libdir}/%{mpidir}/*.so
> %{_libdir}/%{mpidir}/*.la
>-%{_libdir}/%{mpidir}/%{name}/*.la
>-%{_libdir}/pkgconfig/%{name}-%{version}-%{opt_cc}-%{mode}.pc
>+%{_libdir}/%{mpidir}/openmpi/*.la
>+%{_libdir}/pkgconfig/openmpi-%{version}-%{cname}-%{mode}.pc
> %{_libdir}/%{mpidir}/*.mod
> %{_libdir}/%{mpidir}/*.module
> 
> 
> %changelog
>+* Thu Jul 26 2007 Orion Poplawski <orion@cora.nwra.com> - 1.2.3-5
>+- Install then move libraries so --prefix works
>+- Move mode into mpidir
>+- Have -devel Require -libs
>+- Allow for changing the Fortran compiler and package name
>+
> * Mon Jul 16 2007 Doug Ledford <dledford@redhat.com> - 1.2.3-4
> - Fix a directory permission problem on the base openmpi directories
>

Actions: View | Diff

Attachments on bug 191436: 147801 | 159103 | 160036 | 160147