[SCM] mpich.git branch, master, updated. debian/1.4.1-4-28-g077eb9b

Anton Gladky gladky.anton at gmail.com
Tue Jun 18 20:02:17 UTC 2013 

The following commit has been merged in the master branch:
commit a640b7b09e6dfb8841d54a13cc10966357525073
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Tue Jun 18 17:25:13 2013 +0200

    Remove obsolete patches.

diff --git a/debian/patches/destdir.patch b/debian/patches/destdir.patch
deleted file mode 100644
index 88771c9..0000000
--- a/debian/patches/destdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: eborisch at ieee.org 
-Subject: Fix DESTDIR build problem
-
-* Fix problems associated with DESTDIR changes in upstream r8813
-        
-Origin: http://lists.mcs.anl.gov/pipermail/mpich-discuss/2011-August/010680.html
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -202,16 +202,16 @@
- 	if [ -s $(srcdir)/doc/installguide/install.pdf ] ; then $(INSTALL_DATA)  $(srcdir)/doc/installguide/install.pdf ${DESTDIR}${docdir}/install.pdf ; fi
- 	if [ -s $(srcdir)/doc/smpd/smpd_pmi.pdf ] ; then $(INSTALL_DATA)  $(srcdir)/doc/smpd/smpd_pmi.pdf ${DESTDIR}${docdir}/smpd_pmi.pdf ; fi
- 	if [ -s $(srcdir)/doc/logging/logging.pdf ] ; then $(INSTALL_DATA)  $(srcdir)/doc/logging/logging.pdf ${DESTDIR}${docdir}/logging.pdf ; fi
--	(cd src/env && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${DESTDIR}${prefix} exec_prefix=${DESTDIR}${exec_prefix} bindir=${DESTDIR}${bindir} libdir=${DESTDIR}${libdir} includedir=${DESTDIR}${includedir} install)
--	(cd src/packaging/pkgconfig && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${DESTDIR}${prefix} exec_prefix=${DESTDIR}${exec_prefix} bindir=${DESTDIR}${bindir} libdir=${DESTDIR}${libdir} includedir=${DESTDIR}${includedir} install)
--	(cd src/packaging/envmods && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${DESTDIR}${prefix} exec_prefix=${DESTDIR}${exec_prefix} bindir=${DESTDIR}${bindir} libdir=${DESTDIR}${libdir} includedir=${DESTDIR}${includedir} install)
-+	(cd src/env && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${prefix} exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} includedir=${includedir} install)
-+	(cd src/packaging/pkgconfig && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${prefix} exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} includedir=${includedir} install)
-+	(cd src/packaging/envmods && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${prefix} exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} includedir=${includedir} install)
- 	for dir in @bindings_dirs@ - ; do \
- 		if [ "$$dir" = "-" ] ; then break ; fi ;\
--		(cd $$dir && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${DESTDIR}${prefix} exec_prefix=${DESTDIR}${exec_prefix} bindir=${DESTDIR}${bindir} libdir=${DESTDIR}${libdir} includedir=${DESTDIR}${includedir} install) ;\
-+		(cd $$dir && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${prefix} exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} includedir=${includedir} install) ;\
- 	done
- 	for dir in @other_install_dirs@ - ; do \
- 		if [ "$$dir" = "-" ] ; then break ; fi ;\
--		(cd $$dir && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${DESTDIR}${prefix} exec_prefix=${DESTDIR}${exec_prefix} bindir=${DESTDIR}${bindir} libdir=${DESTDIR}${libdir} includedir=${DESTDIR}${includedir} install) ;\
-+		(cd $$dir && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${prefix} exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} includedir=${includedir} install) ;\
- 	done
- 
- install-strip:
diff --git a/debian/patches/link-libs.patch b/debian/patches/link-libs.patch
deleted file mode 100644
index e107222..0000000
--- a/debian/patches/link-libs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: mpich2-1.4.1/Makefile.in
-===================================================================
---- mpich2-1.4.1.orig/Makefile.in
-+++ mpich2-1.4.1/Makefile.in
-@@ -105,20 +105,20 @@
- C_COMPILE       = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
- # Build the shared library from the shared object files
- lib/lib${MPILIBNAME}. at SHLIB_EXT@: lib/lib${MPILIBNAME}.la
--	(cd lib && $(CREATESHLIB) --mode=link  -version-info "$(ABIVERSION)" -o lib${MPILIBNAME}.la  -rpath $(libdir) -L. @LDFLAGS_DEPS@ @LIB_DEPS@ -ldflags "$(LDFLAGS)" $(LIBS))
-+	(cd lib && $(CREATESHLIB) --mode=link  -version-info "$(ABIVERSION)" -o lib${MPILIBNAME}.la  -rpath $(libdir) -L. @LDFLAGS_DEPS@ @LIB_DEPS@ -ldflags "$(LDFLAGS) -Wl,-z,defs" $(LIBS) -lmpl)
- 	if [ -n "@NO_WEAK_SYM@" -a \
- 		"${MPILIBNAME}" != "${PMPILIBNAME}" ] ; then \
--	(cd lib && $(CREATESHLIB) --mode=link  -version-info "$(ABIVERSION)" -o lib${PMPILIBNAME}.la  -rpath $(libdir) );\
-+	(cd lib && $(CREATESHLIB) --mode=link  -version-info "$(ABIVERSION)" -o lib${PMPILIBNAME}.la  -rpath $(libdir) -ldflags "-Wl,-z,defs");\
- 	fi
- # Build the shared library from the shared object files
- lib/libf${MPILIBNAME}. at SHLIB_EXT@: lib/libf${MPILIBNAME}.la
--	(cd lib && $(CREATESHLIB) --mode=link  -version-info "$(ABIVERSION)" -o libf${MPILIBNAME}.la  -rpath $(libdir) -L. @LDFLAGS_DEPS@ -l$(MPILIBNAME) @LIB_DEPS@ -ldflags "$(LDFLAGS)" $(LIBS))
-+	(cd lib && $(CREATESHLIB) --mode=link  -version-info "$(ABIVERSION)" -o libf${MPILIBNAME}.la  -rpath $(libdir) -L. @LDFLAGS_DEPS@ -l$(MPILIBNAME) @LIB_DEPS@ -ldflags "$(LDFLAGS) -Wl,-z,defs" $(LIBS))
- # Build the shared library from the shared object files
- lib/lib${MPILIBNAME}f90. at SHLIB_EXT@: lib/lib${MPILIBNAME}f90.la
--	(cd lib && $(CREATESHLIB) --mode=link  -version-info "$(ABIVERSION)" -o lib${MPILIBNAME}f90.la  -rpath $(libdir) -L. @LDFLAGS_DEPS@ -l$(MPILIBNAME) @LIB_DEPS@ -ldflags "$(LDFLAGS)" $(LIBS))
-+	(cd lib && $(CREATESHLIB) --mode=link  -version-info "$(ABIVERSION)" -o lib${MPILIBNAME}f90.la  -rpath $(libdir) -L. @LDFLAGS_DEPS@ -l$(MPILIBNAME) @LIB_DEPS@ -ldflags "$(LDFLAGS) -Wl,-z,defs" $(LIBS))
- # Build the shared library from the shared object files
- lib/lib${MPICXXLIBNAME}. at SHLIB_EXT@: lib/lib${MPICXXLIBNAME}.la
--	(cd lib && $(CREATESHLIB) --mode=link  -version-info "$(ABIVERSION)" -o lib${MPICXXLIBNAME}.la  -rpath $(libdir) -L. @LDFLAGS_DEPS@ -l$(MPILIBNAME) @LIB_DEPS@ -ldflags "$(LDFLAGS)" $(LIBS))
-+	(cd lib && $(CREATESHLIB) --mode=link  -version-info "$(ABIVERSION)" -o lib${MPICXXLIBNAME}.la  -rpath $(libdir) -L. @LDFLAGS_DEPS@ -l$(MPILIBNAME) @LIB_DEPS@ -ldflags "$(LDFLAGS) -Wl,-z,defs" $(LIBS) -lstdc++)
- 
- # --------------------------------------------------------------------------
- .libstamp0: 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1e915dd..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-# destdir.patch
-# link-libs.patch

-- 
mpich.git

More information about the debian-science-commits mailing list