[gentoo-commits] gentoo-x86 commit in sci-chemistry/apbs/files: apbs-1.3-zlib.patch apbs-1.3-python.patch apbs-1.3-shared.patch apbs-1.2.1b-multilib.patch

[Justin Lecher (jlec)]

jlec        10/11/04 09:40:09

  Modified:             apbs-1.3-shared.patch apbs-1.2.1b-multilib.patch
  Added:                apbs-1.3-zlib.patch apbs-1.3-python.patch
  Log:
  Fix compilation of python module, fix support for zlib
  
  (Portage version: 2.2.0_alpha3/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  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.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.3-shared.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.3-shared.patch?r1=1.2&r2=1.3

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apbs-1.3-shared.patch	1 Nov 2010 17:25:23 -0000	1.2
+++ apbs-1.3-shared.patch	4 Nov 2010 09:40:09 -0000	1.3
@@ -90,7 +90,7 @@
  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@ @mc_lib@
++		     @OPENMP_LIBS@ @maloc_lib@ @mc_lib@ @z_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.2                  sci-chemistry/apbs/files/apbs-1.2.1b-multilib.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.2.1b-multilib.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.2.1b-multilib.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.2.1b-multilib.patch?r1=1.1&r2=1.2

Index: apbs-1.2.1b-multilib.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/files/apbs-1.2.1b-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apbs-1.2.1b-multilib.patch	15 Jun 2010 18:02:50 -0000	1.1
+++ apbs-1.2.1b-multilib.patch	4 Nov 2010 09:40:09 -0000	1.2
@@ -20,13 +20,3 @@
  lib_LTLIBRARIES = libapbsmainroutines.la
  libapbsmainroutines_la_SOURCES = routines.c
  libapbsmainroutines_la_LDFLAGS = -version-info ${APBS_VERSION}
---- contrib/maloc/src/aaa_lib/Makefile.am
-+++ contrib/maloc/src/aaa_lib/Makefile.am
-@@ -49,7 +49,6 @@
- LIBEFENCE =
- endif
- 
--libdir = ${prefix}/lib
- lib_LTLIBRARIES = libmaloc.la ${LIBEFENCE}
- 
- libmaloc_la_SOURCES =



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

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.3-zlib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.3-zlib.patch?rev=1.1&content-type=text/plain

Index: apbs-1.3-zlib.patch
===================================================================
diff --git a/configure.ac b/configure.ac
index 31a0053..7301f0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1052,10 +1053,10 @@ AC_ARG_ENABLE(
 	[zlib],
 	AS_HELP_STRING([--disable-zlib], [disable zlib compilation]),,
 )
-if test x"$disable_zlib" == "xno"; then
+if test x"$disable_zlib" == "xyes"; then
 	AC_MSG_RESULT([yes])
 	zlib="zlib"
-	z_lib=${contrib_path}/zlib/.libs/libz.a
+	z_lib=-lz
 	AC_DEFINE([HAVE_ZLIB], [], [have zlib compression enabled])
 fi
 AC_SUBST(zlib)
@@ -1307,12 +1308,8 @@ AC_CONFIG_FILES([
     Makefile
 
     contrib/Makefile
-    contrib/blas/Makefile
     contrib/pmgZ/Makefile
     contrib/aqua/Makefile
-    contrib/opal/Makefile
-    contrib/opal/ZSI/Makefile
-    contrib/zlib/Makefile	
 	
     tools/Makefile
     tools/mesh/Makefile
diff --git a/src/mg/vgrid.c b/src/mg/vgrid.c
index d183bb2..e0669ab 100644
--- a/src/mg/vgrid.c
+++ b/src/mg/vgrid.c
@@ -432,7 +432,7 @@ VPUBLIC int Vgrid_gradient(Vgrid *thee, double pt[3], double grad[3]) {
  /////////////////////////////////////////////////////////////////////////// */
 #ifdef HAVE_ZLIB
 #define off_t long
-#include "../../contrib/zlib/zlib.h"
+#include <zlib.h>
 #endif
 VPUBLIC int Vgrid_readGZ(Vgrid *thee, const char *fname) {
 



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

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.3-python.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.3-python.patch?rev=1.1&content-type=text/plain

Index: apbs-1.3-python.patch
===================================================================
diff --git a/configure.ac b/configure.ac
index 31a0053..7301f0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -585,6 +585,7 @@ if test x"$enable_python" != "xno"; then
 			PY_SHARED="-shared"
 			CC="${CC} -fPIC"
 			F77="${F77} -fPIC"
+			PY_LDFLAGS="-lpython$PY_VERSION"
 			;;
 		irix*) 
 			PY_SHARED="-shared"
diff --git a/tools/python/Makefile.am b/tools/python/Makefile.am
index 431640c..2c1fbea 100644
--- a/tools/python/Makefile.am
+++ b/tools/python/Makefile.am
@@ -16,4 +16,4 @@ SUBDIRS          = vgrid
 noinst_PROGRAMS       = _apbslib.so
 _apbslib_so_SOURCES   = apbslib.c
 _apbslib_so_LINK      = $(PY_CC) $(PY_LINKFLAGS) $(LDFLAGS) -o $@ $(PY_SHARED)
-_apbslib_so_LDADD     = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a $(PY_LDFLAGS) ${z_lib} 
+_apbslib_so_LDADD     = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a $(PY_LDFLAGS) ${z_lib} @OPENMP_LIBS@ @maloc_lib@ @mc_lib@