Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv10120
Modified Files:
hdf5.info hdf5.patch
Log Message:
Build two-level libraries. Since we've ditched 10.4 from this .info file,
do some dylib stripping.
Index: hdf5.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/hdf5.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hdf5.patch 28 Jan 2009 19:59:38 -0000 1.3
+++ hdf5.patch 26 May 2011 18:17:13 -0000 1.4
@@ -1,14 +1,14 @@
---- hdf5/configure.orig Fri Nov 5 12:53:29 2004
-+++ hdf5/configure Fri Nov 5 12:53:51 2004
-@@ -5286,7 +5286,7 @@
- # FIXME: Relying on posixy $() will cause problems for
- # cross-compilation, but unfortunately the echo tests do not
- # yet detect zsh echo's removal of \ escapes.
-- archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags
-install_name $rpath/$soname $verstring'
-+ archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -lsz
-install_name $rpath/$soname $verstring'
- # We need to add '_' to the symbols in $export_symbols first
- #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
- hardcode_direct=yes
+diff -Naur hdf5-1.6.10/configure.in hdf5-1.6.10.patched/configure.in
+--- hdf5-1.6.10/configure.in 2009-11-10 13:02:05.000000000 -0500
++++ hdf5-1.6.10.patched/configure.in 2011-05-26 09:40:47.000000000 -0400
+@@ -2071,6 +2071,7 @@
+ AC_SUBST([STATIC_SHARED])
+ AC_SUBST([enable_shared])
+ AC_SUBST([enable_static])
++LT_OUTPUT
+ if (grep '^build_libtool_libs=yes' libtool >/dev/null); then
+ enable_shared=yes
+ else
--- hdf5/fortran/config/powerpc-apple.orig 2006-01-02 19:56:15.000000000
-0700
+++ hdf5/fortran/config/powerpc-apple 2006-01-02 19:59:05.000000000 -0700
@@ -30,10 +30,20 @@
Index: hdf5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/hdf5.info,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- hdf5.info 24 Dec 2010 02:49:02 -0000 1.26
+++ hdf5.info 26 May 2011 18:17:13 -0000 1.27
@@ -1,6 +1,7 @@
Package: hdf5
Version: 1.6.10
-Revision: 1
+Revision: 3
+Distribution: 10.5, 10.6
Source: ftp://ftp.hdfgroup.org/HDF5/current16/src/%n-%v.tar.gz
Source-MD5: 6e207a95d22e9e9ffdfaecdd580cd1b3
Description: Library and file format for scientific data
@@ -16,6 +17,10 @@
Since the fortran interface builds static libraries, either gcc44 or gcc45 can
be used
to provide gfortran.
<<
+DescPort: <<
+Patch configure.in to make sure that we can use autoreconf.
+Use autoreconf so that the package will build a twolevel dylib.
+<<
Depends: %N-shlibs (= %v-%r), %N-bin, szip-shlibs (>= 2.0-2)
BuildDepends: szip (>= 2.0-2), gcc44 | gcc45, fink ( >= 0.24.12)
Conflicts: hdf5-18, hdf5-18-gfortran
@@ -33,19 +38,23 @@
perl -pi -e 's,sort \+2,sort -k 2,' bin/ltmain.sh
<<
PatchFile: %n.patch
-PatchFile-MD5: a756f9c68a5224dcaeb5a82d1b22362c
+PatchFile-MD5: e51d36a1cc6aefaa0235f3a61abac1a2
ConfigureParams: <<
--enable-cxx --without-ssl --with-zlib --without-mpe --without-pablo
--with-szlib \
---without-gass --without-srb --without-pthread --enable-fortran
--disable-parallel
+--without-gass --without-srb --without-pthread --enable-fortran
--disable-parallel
<<
License: OSI-Approved
InfoTest: <<
TestScript: make check || exit 2
<<
+SetLDFLAGS: -Wl,-dead_strip_dylibs
CompileScript: <<
#!/bin/sh -ev
export F9X=%p/bin/gfortran
export FFLAGS='-fsecond-underscore'
+ export LIBS='-lsz'
+ /usr/bin/autoreconf -fi
+# export LDFLAGS="$LDFLAGS -Wl,-dead_strip_dylibs"
if [ "%m" = "x86_64" ]; then
./configure %c --build=%m-apple-darwin`uname -r|cut -f1 -d.`
--host=%m-apple-darwin`uname -r|cut -f1 -d.`
else
------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery,
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now.
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
