| 1 |
jlec 10/11/01 17:25:23 |
| 2 |
|
| 3 |
Modified: apbs-1.3-shared.patch |
| 4 |
Added: apbs-1.3-mainroutines.patch |
| 5 |
Log: |
| 6 |
Include support for FETK |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha3/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 sci-chemistry/apbs/files/apbs-1.3-shared.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.3-shared.patch?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.3-shared.patch?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.3-shared.patch?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: apbs-1.3-shared.patch |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/files/apbs-1.3-shared.patch,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- apbs-1.3-shared.patch 27 Oct 2010 17:19:45 -0000 1.1 |
| 24 |
+++ apbs-1.3-shared.patch 1 Nov 2010 17:25:23 -0000 1.2 |
| 25 |
@@ -1,5 +1,5 @@ |
| 26 |
diff --git a/Makefile.am b/Makefile.am |
| 27 |
-index b400095..9e6d698 100644 |
| 28 |
+index b400095..af3a3a3 100644 |
| 29 |
--- a/Makefile.am |
| 30 |
+++ b/Makefile.am |
| 31 |
@@ -16,6 +16,9 @@ SUFFIXES = .H .h .C .cc .c .f .o |
| 32 |
@@ -81,16 +81,16 @@ |
| 33 |
AC_OUTPUT |
| 34 |
|
| 35 |
diff --git a/src/aaa_lib/Makefile.am b/src/aaa_lib/Makefile.am |
| 36 |
-index 2c5026b..d8d0650 100644 |
| 37 |
+index 0064aaa..8b33f70 100644 |
| 38 |
--- a/src/aaa_lib/Makefile.am |
| 39 |
+++ b/src/aaa_lib/Makefile.am |
| 40 |
-@@ -22,7 +22,8 @@ libdir = ${prefix}/lib |
| 41 |
+@@ -21,7 +21,8 @@ BLAS_LIBS = @blas_lib@ |
| 42 |
lib_LTLIBRARIES = libapbs.la |
| 43 |
|
| 44 |
libapbs_la_SOURCES = apbs_link.c |
| 45 |
-libapbs_la_LIBADD = ${GEN_LIBS} ${FEM_LIBS} ${MG_LIBS} ${PMGZ_LIBS} ${AQUA_LIBS} ${BLAS_LIBS} |
| 46 |
+libapbs_la_LIBADD = ${GEN_LIBS} ${FEM_LIBS} ${MG_LIBS} ${PMGZ_LIBS} ${AQUA_LIBS} ${BLAS_LIBS} \ |
| 47 |
-+ @OPENMP_LIBS@ @maloc_lib@ |
| 48 |
++ @OPENMP_LIBS@ @maloc_lib@ @mc_lib@ |
| 49 |
libapbs_la_LDFLAGS = -version-info ${APBS_VERSION} |
| 50 |
|
| 51 |
INCLUDES = -I${top_srcdir}/src/generic -I${top_srcdir}/src/mg -I${top_srcdir}/src/fem @inc_list@ |
| 52 |
|
| 53 |
|
| 54 |
|
| 55 |
1.1 sci-chemistry/apbs/files/apbs-1.3-mainroutines.patch |
| 56 |
|
| 57 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.3-mainroutines.patch?rev=1.1&view=markup |
| 58 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.3-mainroutines.patch?rev=1.1&content-type=text/plain |
| 59 |
|
| 60 |
Index: apbs-1.3-mainroutines.patch |
| 61 |
=================================================================== |
| 62 |
diff --git a/bin/Makefile.am b/bin/Makefile.am |
| 63 |
index 15158ca..f73d276 100644 |
| 64 |
--- a/bin/Makefile.am |
| 65 |
+++ b/bin/Makefile.am |
| 66 |
@@ -29,6 +29,7 @@ rm.apbs: Makefile |
| 67 |
|
| 68 |
lib_LTLIBRARIES = libapbsmainroutines.la |
| 69 |
libapbsmainroutines_la_SOURCES = routines.c |
| 70 |
+libapbsmainroutines_la_LIBADD = -L../src/aaa_lib/.libs/ -lapbs @mc_lib@ |
| 71 |
libapbsmainroutines_la_LDFLAGS = -version-info ${APBS_VERSION} |
| 72 |
|
| 73 |
INCLUDES = @inc_list@ |
Archives