[gentoo-commits] gentoo-x86 commit in sci-chemistry/apbs/files: apbs-1.3-mainroutines.patch apbs-1.3-shared.patch

[gentoo-commits] gentoo-x86 commit in sci-chemistry/apbs/files: apbs-1.3-mainroutines.patch apbs-1.3-shared.patch

[Justin Lecher (jlec)]

jlec        10/11/01 17:25:23

  Modified:             apbs-1.3-shared.patch
  Added:                apbs-1.3-mainroutines.patch
  Log:
  Include support for FETK
  
  (Portage version: 2.2.0_alpha3/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sci-chemistry/apbs/files/apbs-1.3-shared.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.3-shared.patch?rev=1.2&view=markup
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
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.3-shared.patch?r1=1.1&r2=1.2

Index: apbs-1.3-shared.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/files/apbs-1.3-shared.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apbs-1.3-shared.patch	27 Oct 2010 17:19:45 -0000	1.1
+++ apbs-1.3-shared.patch	1 Nov 2010 17:25:23 -0000	1.2
@@ -1,5 +1,5 @@
 diff --git a/Makefile.am b/Makefile.am
-index b400095..9e6d698 100644
+index b400095..af3a3a3 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -16,6 +16,9 @@ SUFFIXES = .H .h .C .cc .c .f .o
@@ -81,16 +81,16 @@
  AC_OUTPUT
  
 diff --git a/src/aaa_lib/Makefile.am b/src/aaa_lib/Makefile.am
-index 2c5026b..d8d0650 100644
+index 0064aaa..8b33f70 100644
 --- a/src/aaa_lib/Makefile.am
 +++ b/src/aaa_lib/Makefile.am
-@@ -22,7 +22,8 @@ libdir = ${prefix}/lib
+@@ -21,7 +21,8 @@ BLAS_LIBS = @blas_lib@
  lib_LTLIBRARIES = libapbs.la
  
  libapbs_la_SOURCES = apbs_link.c
 -libapbs_la_LIBADD  = ${GEN_LIBS} ${FEM_LIBS} ${MG_LIBS} ${PMGZ_LIBS} ${AQUA_LIBS} ${BLAS_LIBS}
 +libapbs_la_LIBADD  = ${GEN_LIBS} ${FEM_LIBS} ${MG_LIBS} ${PMGZ_LIBS} ${AQUA_LIBS} ${BLAS_LIBS} \
-+		     @OPENMP_LIBS@ @maloc_lib@
++		     @OPENMP_LIBS@ @maloc_lib@ @mc_lib@
  libapbs_la_LDFLAGS = -version-info ${APBS_VERSION}
  
  INCLUDES         = -I${top_srcdir}/src/generic -I${top_srcdir}/src/mg -I${top_srcdir}/src/fem @inc_list@



1.1                  sci-chemistry/apbs/files/apbs-1.3-mainroutines.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.3-mainroutines.patch?rev=1.1&view=markup
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

Index: apbs-1.3-mainroutines.patch
===================================================================
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 15158ca..f73d276 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -29,6 +29,7 @@ rm.apbs: Makefile
 
 lib_LTLIBRARIES = libapbsmainroutines.la
 libapbsmainroutines_la_SOURCES = routines.c
+libapbsmainroutines_la_LIBADD = -L../src/aaa_lib/.libs/ -lapbs @mc_lib@
 libapbsmainroutines_la_LDFLAGS = -version-info ${APBS_VERSION}
 
 INCLUDES = @inc_list@