* [gentoo-commits] gentoo-x86 commit in sci-chemistry/apbs/files: apbs-1.0.0-install-fix.patch apbs-1.0.0-libmaloc-noinstall.patch apbs-1.0.0-openmpi.patch
@ 2008-04-29 22:21 99% Markus Dittrich (markusle)
0 siblings, 0 replies; 1+ results
From: Markus Dittrich (markusle) @ 2008-04-29 22:21 UTC (permalink / raw
To: gentoo-commits
markusle 08/04/29 22:21:20
Added: apbs-1.0.0-install-fix.patch
apbs-1.0.0-libmaloc-noinstall.patch
apbs-1.0.0-openmpi.patch
Log:
Version bump (fixes bug #219599). Changed license to BSD since it most closely matches the apbs license.
(Portage version: 2.1.5_rc6)
Revision Changes Path
1.1 sci-chemistry/apbs/files/apbs-1.0.0-install-fix.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.0.0-install-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.0.0-install-fix.patch?rev=1.1&content-type=text/plain
Index: apbs-1.0.0-install-fix.patch
===================================================================
diff -Naur apbs-1.0.0-source/Makefile.am apbs-1.0.0-source.new/Makefile.am
--- apbs-1.0.0-source/Makefile.am 2008-04-17 16:44:51.000000000 -0400
+++ apbs-1.0.0-source.new/Makefile.am 2008-04-28 18:51:14.000000000 -0400
@@ -28,7 +28,10 @@
-rm -f ./bin/apbs
install-data-local:
- mkdir -p ${prefix}/share
- -cp -rf examples ${prefix}/share
- -cp -rf doc ${prefix}/share
- -cp -rf tools ${prefix}/share
+ mkdir -p $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/examples
+ mkdir -p $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/tools
+ -rm -f doc/LICENSE.txt
+ -rm -f tools/manip/*.pyc
+ -cp -rf doc $(DESTDIR)${prefix}/share
+ -cp -rf examples $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/
+ -cp -rf tools $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/
1.1 sci-chemistry/apbs/files/apbs-1.0.0-libmaloc-noinstall.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.0.0-libmaloc-noinstall.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.0.0-libmaloc-noinstall.patch?rev=1.1&content-type=text/plain
Index: apbs-1.0.0-libmaloc-noinstall.patch
===================================================================
diff -Naur apbs-1.0.0-source/contrib/maloc/src/aaa_inc/maloc/Makefile.in apbs-1.0.0-source.new/contrib/maloc/src/aaa_inc/maloc/Makefile.in
--- apbs-1.0.0-source/contrib/maloc/src/aaa_inc/maloc/Makefile.in 2008-04-17 16:40:56.000000000 -0400
+++ apbs-1.0.0-source.new/contrib/maloc/src/aaa_inc/maloc/Makefile.in 2008-04-29 13:32:58.000000000 -0400
@@ -265,12 +265,12 @@
uninstall-info-am:
install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ test -z "$(includedir)" || $(mkdir_p) "$(includedir)"
@list='$(include_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(includedir)/$$f"; \
done
uninstall-includeHEADERS:
diff -Naur apbs-1.0.0-source/contrib/maloc/src/aaa_lib/Makefile.in apbs-1.0.0-source.new/contrib/maloc/src/aaa_lib/Makefile.in
--- apbs-1.0.0-source/contrib/maloc/src/aaa_lib/Makefile.in 2008-04-17 16:40:54.000000000 -0400
+++ apbs-1.0.0-source.new/contrib/maloc/src/aaa_lib/Makefile.in 2008-04-29 09:13:08.000000000 -0400
@@ -283,12 +283,12 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ test -z "$(libdir)" || $(mkdir_p) "$(libdir)"
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(libdir)/$$f"; \
else :; fi; \
done
1.1 sci-chemistry/apbs/files/apbs-1.0.0-openmpi.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.0.0-openmpi.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.0.0-openmpi.patch?rev=1.1&content-type=text/plain
Index: apbs-1.0.0-openmpi.patch
===================================================================
diff -Naur apbs-1.0.0-source/configure.ac apbs-1.0.0-source.new/configure.ac
--- apbs-1.0.0-source/configure.ac 2008-04-17 16:44:51.000000000 -0400
+++ apbs-1.0.0-source.new/configure.ac 2008-04-28 17:51:47.000000000 -0400
@@ -521,28 +521,27 @@
fi
fi
-# if test -n "${USE_OPMI}"; then
-# AC_CHECK_FILE(${mpi_path}/lib/libmpi.a, [HAS_MPI_LIB="yes"], [])
-# AC_CHECK_FILE(${mpi_path}/lib/libmpi.so, [HAS_MPI_LIB="yes"], [])
-# AC_CHECK_FILE(${mpi_path}/lib/liblam.dylib, [HAS_MPI_LIB="yes"], [])
-# if test -n "${HAS_MPI_LIB}"; then
-# mpi_lib="-L${mpi_path}/lib -lmpi"
-# else
-# AC_MSG_ERROR([Error...Could not find LAM-MPI libraries in ${mpi_path}/lib], 0)
-# fi
-# fi
+ if test -n "${USE_OPMI}"; then
+ AC_CHECK_FILE(${mpi_path}/lib/libmpi.a, [HAS_MPI_LIB="yes"], [])
+ AC_CHECK_FILE(${mpi_path}/lib/libmpi.so, [HAS_MPI_LIB="yes"], [])
+ if test -n "${HAS_MPI_LIB}"; then
+ mpi_lib="-L${mpi_path}/lib -lmpi"
+ else
+ AC_MSG_ERROR([Error...Could not find OPEN-MPI libraries in ${mpi_path}/lib], 0)
+ fi
+ fi
USE_MPI="yes"
fi
-if test -n "${USE_OPMI}"; then
- HAS_MPI_LIB="yes"
- HAS_MPI_INC="yes"
- mpi_inc=""
- mpi_lib=""
- AC_DEFINE([HAVE_MPI_H], [], [have the MPI library])
- USE_MPI="yes"
-fi
+#if test -n "${USE_OPMI}"; then
+# HAS_MPI_LIB="yes"
+# HAS_MPI_INC="yes"
+# mpi_inc=""
+# mpi_lib=""
+# AC_DEFINE([HAVE_MPI_H], [], [have the MPI library])
+# USE_MPI="yes"
+#fi
AC_SUBST(mpi_lib)
AC_SUBST(mpi_inc)
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2008-04-29 22:21 99% [gentoo-commits] gentoo-x86 commit in sci-chemistry/apbs/files: apbs-1.0.0-install-fix.patch apbs-1.0.0-libmaloc-noinstall.patch apbs-1.0.0-openmpi.patch Markus Dittrich (markusle)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox