Date: Tuesday, February 16, 2010 @ 08:32:06 Author: ronald Revision: 69046
upgpkg: hdf5 1.8.4-3 move back to repos as new dependency of netcdf Modified: hdf5/trunk/PKGBUILD Deleted: hdf5/trunk/gcc-4.3.patch ---------------+ PKGBUILD | 106 +++++++++++++------------------------------------------- gcc-4.3.patch | 41 --------------------- 2 files changed, 26 insertions(+), 121 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-02-16 13:30:35 UTC (rev 69045) +++ PKGBUILD 2010-02-16 13:32:06 UTC (rev 69046) @@ -1,93 +1,39 @@ -# $Id$ -# Maintainer: damir <da...@archlinux.org> +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Stefan Husmann <stefan-husm...@t-online.de> +# Contributor: damir <da...@archlinux.org> # Contributor: Tom K <t...@runbox.com> pkgname=hdf5 -pkgver=1.8.0 +pkgver=1.8.4 pkgrel=3 -arch=("i686" "x86_64") +arch=('i686' 'x86_64') pkgdesc="General purpose library and file format for storing scientific data" -url="http://hdf.ncsa.uiuc.edu/HDF5/" -license=("custom") -depends=('zlib' 'openssl' 'gcc-libs>=4.3.0') -makedepends=('gcc' 'time') -source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver}.tar.gz - gcc-4.3.patch) -options=("!libtool") -md5sums=('e68e13685a56b50cab237fd58dc7a59c' '0c59e6004536914e62324037ad49d82e') -md5sums=('e68e13685a56b50cab237fd58dc7a59c' - '4af864c222a9cf4b924ce7ff0f371cc5') +url="http://www.hdfgroup.org/HDF5/" +license=('custom') +depends=('zlib' 'sh') +makedepends=('time') +source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver}.tar.gz) +md5sums=('971cc81ef10f50d2bb63cd6879fca7bc') +options=('!libtool') build() { - cd ${startdir}/src/${pkgname}-${pkgver} + cd $srcdir/${pkgname}-${pkgver} unset CFLAGS unset CXXFLAGS - patch -Np0 -i ${startdir}/src/gcc-4.3.patch || return 1 - F9X=gfortran ./configure --prefix=/usr \ - --enable-hl \ - --enable-threadsafe \ - --enable-linux-lfs \ - --enable-production \ - --enable-hdf5v1_4 \ - --enable-hdf5v1_6 \ - --enable-cxx \ - --enable-fortran \ - --enable-shared \ - --with-pic \ - --docdir=/usr/share/hdf5/ \ - --with-pthread=/usr/lib/ \ - --with-ssl=/usr/lib/ + ./configure --prefix=/usr \ + --enable-hl \ + --enable-threadsafe \ + --enable-linux-lfs \ + --enable-production \ + --with-pic \ + --docdir=/usr/share/doc/hdf5/ \ + --with-pthread=/usr/lib/ \ + --disable-sharedlib-rpath make || return 1 - make check || return 1 - make -j1 prefix=${startdir}/pkg/usr install || return 1 + make -j1 prefix=$pkgdir/usr install || return 1 - install -d -m755 ${startdir}/pkg/usr/share/licenses/${pkgname} || return 1 - install -m644 ${startdir}/src/${pkgname}-${pkgver}/COPYING \ - ${startdir}/pkg/usr/share/licenses/${pkgname}/LICENSE || return 1 + install -d -m755 $pkgdir/usr/share/licenses/${pkgname} || return 1 + install -m644 $srcdir/${pkgname}-${pkgver}/COPYING \ + $pkgdir/usr/share/licenses/${pkgname}/LICENSE || return 1 } - - -# Debug Mode: None -# Shared Libraries: Yes -# Static Libraries: Yes -# Statically Linked Executables: No -# Default Version of Public Symbols: v18 -# With Deprecated Public Symbols: Yes -# Tracing: No -# Clear file buffers before write: Yes -# Using memory checker: No -# Optimization Instrumentation: No -# -# Languages: -# ---------- -# C++: Yes -# C++ Compiler: g++ -# CXXFLAGS / H5_CXXFLAGS: -march=x86-64 -mtune=generic -O2 -pipe -# -# Fortran: Yes -# Fortran Compiler: gfortran -# FCFLAGS / H5_FCFLAGS: -I. -# -# -# Features: -# --------- -# dmalloc: No -# Function Stack Tracing: Disabled -# GPFS: No -# Strict File Format Checks: Disabled -# Default API Mapping: v18 -# hsize_t: Large -# I/O filters (external): deflate(zlib) -# I/O filters (internal): shuffle,fletcher32,nbit,scaleoffset -# Linux Large File Support (LFS): Enabled -# MPE: No -# Parallel HDF5: No -# Direct VFD: Disabled -# Threadsafety: Enabled -# High Level library: Enabled - - - - - Deleted: gcc-4.3.patch =================================================================== --- gcc-4.3.patch 2010-02-16 13:30:35 UTC (rev 69045) +++ gcc-4.3.patch 2010-02-16 13:32:06 UTC (rev 69046) @@ -1,41 +0,0 @@ ---- config/gnu-flags~ 2008-03-09 14:43:45.000000000 +0000 -+++ config/gnu-flags 2008-03-09 14:45:11.000000000 +0000 -@@ -157,6 +157,10 @@ - # later versions of gcc will fix this bug... - QAK - 2003/10/20 - PROD_CFLAGS="-O" - ;; -+ gcc-4.3*) -+ # Make check segfaults in the long long test with -O and -O2 -+ PROD_CFLAGS="" -+ ;; - gcc-4*) - # Be optimistic about future versions of gcc.. :-) - QAK - 2003/10/20 - PROD_CFLAGS="-O3" -@@ -166,7 +170,6 @@ - ;; - esac - -- PROD_CFLAGS="$PROD_CFLAGS -fomit-frame-pointer -finline-functions" - PROD_CPPFLAGS= - - # Debug -@@ -191,7 +194,7 @@ - # Closer to the gcc 4.2 release, we should check for additional flags to - # include and break it out into it's own section, like the other versions - # below. -QAK -- gcc-4.[12]*) -+ gcc-4.[123]*) - # Replace -ansi flag with -std=c99 flag - H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`" - ---- c++/src/H5PropList.cpp.orig 2008-03-08 23:17:27.000000000 +0000 -+++ c++/src/H5PropList.cpp 2008-03-08 23:17:52.000000000 +0000 -@@ -426,7 +426,7 @@ - if (temp_str != NULL) - { - H5std_string class_name = H5std_string(temp_str); -- free(temp_str); -+ delete(temp_str); - return(class_name); - } - else