[hdf5] 06/12: First successful build of 1.10~pre1+docs
Gilles Filippini
pini at debian.org
Tue Mar 29 18:40:02 UTC 2016
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master-1.10
in repository hdf5.
commit c614bf2f561b2c7421b96baa9d7f7b15e60aab8c
Author: Gilles Filippini <pini at debian.org>
Date: Sat Mar 19 11:06:10 2016 +0100
First successful build of 1.10~pre1+docs
---
debian/changelog | 9 +++-
debian/patches/flavor-configure-option.patch | 61 ++++++++++++++--------------
debian/patches/path_max.diff | 4 +-
debian/patches/relax-version-check.patch | 2 +-
debian/rules | 6 +--
5 files changed, 44 insertions(+), 38 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 266b677..9332b04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
-hdf5 (1.10.0~alpha1+docs-1) UNRELEASED; urgency=medium
+hdf5 (1.10.0~pre1+docs-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Integration of Java HDF5 JNI into the source tree (not enabled in
+ the build).
+
* Refresh lintian overrides.
* Drop patches:
- format-not-a-string-literal-and-no-format-arguments.patch: fixed
@@ -9,7 +12,9 @@ hdf5 (1.10.0~alpha1+docs-1) UNRELEASED; urgency=medium
* Refresh other patches.
* libhdf5-cpp-<SONAME_CXX>: drop versioned dependency on libhdf5-<SONAME>
to ease future transitions.
- * debian/rules: improve soname retrival.
+ * debian/rules:
+ - improve soname retrieval.
+ - replace deprecated '--enable-production' with '--enable-build-mode'.
-- Gilles Filippini <pini at debian.org> Sat, 23 Jan 2016 15:18:33 +0100
diff --git a/debian/patches/flavor-configure-option.patch b/debian/patches/flavor-configure-option.patch
index ca940be..655ea5c 100644
--- a/debian/patches/flavor-configure-option.patch
+++ b/debian/patches/flavor-configure-option.patch
@@ -10,7 +10,7 @@ Index: hdf5/configure.ac
===================================================================
--- hdf5.orig/configure.ac
+++ hdf5/configure.ac
-@@ -3083,6 +3083,24 @@ fi
+@@ -3490,6 +3490,24 @@ fi
##
AM_CONDITIONAL([HAVE_SHARED_CONDITIONAL], [test "X$enable_shared" = "Xyes"])
@@ -39,10 +39,10 @@ Index: hdf5/src/libhdf5.settings.in
===================================================================
--- hdf5.orig/src/libhdf5.settings.in
+++ hdf5/src/libhdf5.settings.in
-@@ -12,6 +12,7 @@ General Information:
- Byte sex: @BYTESEX@
- Libraries: @STATIC_SHARED@
- Installation point: @prefix@
+@@ -10,6 +10,7 @@ General Information:
+ Uname information: @UNAME_INFO@
+ Byte sex: @BYTESEX@
+ Installation point: @prefix@
+ Flavor name: @FLAVOR_NAME@
Compiling Options:
@@ -348,9 +348,9 @@ Index: hdf5/fortran/src/Makefile.am
+libhdf5 at FLAVOR@_fortran_la_SOURCES=H5f90global.f90 \
H5fortran_types.F90 H5_ff.F90 H5Aff.F90 H5Dff.F90 H5Eff.F90 \
H5Fff.F90 H5Gff.F90 H5Iff.F90 H5Lff.F90 H5Off.F90 H5Pff.F90 H5Rff.F90 H5Sff.F90 \
- H5Tff.F90 H5Zff.F90 H5_gen.f90 \
+ H5Tff.F90 H5Zff.F90 H5_gen.F90 H5fortkit.F90 \
@@ -51,7 +51,7 @@ libhdf5_fortran_la_SOURCES=H5f90global.F
- H5If.c H5Lf.c H5Of.c H5Pf.c H5Rf.c H5Sf.c H5Tf.c H5Zf.c HDF5.f90
+ H5If.c H5Lf.c H5Of.c H5Pf.c H5Rf.c H5Sf.c H5Tf.c H5Zf.c HDF5.F90
# HDF5 Fortran library depends on HDF5 Library.
-libhdf5_fortran_la_LIBADD=$(LIBHDF5)
@@ -358,29 +358,6 @@ Index: hdf5/fortran/src/Makefile.am
# h5fc is generated during configure.
# Remove it only when distclean.
-Index: hdf5/config/commence.am
-===================================================================
---- hdf5.orig/config/commence.am
-+++ hdf5/config/commence.am
-@@ -32,14 +32,14 @@ CP=cp
- RUNEXEC=$(RUNSERIAL)
-
- # Libraries to link to while building
--LIBHDF5=$(top_builddir)/src/libhdf5.la
-+LIBHDF5=$(top_builddir)/src/libhdf5 at FLAVOR@.la
- LIBH5TEST=$(top_builddir)/test/libh5test.la
--LIBH5F=$(top_builddir)/fortran/src/libhdf5_fortran.la
-+LIBH5F=$(top_builddir)/fortran/src/libhdf5 at FLAVOR@_fortran.la
- LIBH5FTEST=$(top_builddir)/fortran/test/libh5test_fortran.la
- LIBH5CPP=$(top_builddir)/c++/src/libhdf5_cpp.la
- LIBH5TOOLS=$(top_builddir)/tools/lib/libh5tools.la
--LIBH5_HL=$(top_builddir)/hl/src/libhdf5_hl.la
--LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-+LIBH5_HL=$(top_builddir)/hl/src/libhdf5 at FLAVOR@_hl.la
-+LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5 at FLAVOR@hl_fortran.la
- LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
- # Install directories that automake doesn't know about
Index: hdf5/hl/fortran/src/Makefile.am
===================================================================
--- hdf5.orig/hl/fortran/src/Makefile.am
@@ -437,3 +414,27 @@ Index: hdf5/hl/src/Makefile.am
# Public header files (to be installed)
include_HEADERS=hdf5_hl.h H5DOpublic.h H5IMpublic.h H5LTpublic.h H5TBpublic.h H5DSpublic.h H5PTpublic.h H5LDpublic.h
+Index: hdf5/config/commence.am
+===================================================================
+--- hdf5.orig/config/commence.am
++++ hdf5/config/commence.am
+@@ -32,15 +32,15 @@ CP=cp
+ RUNEXEC=$(RUNSERIAL)
+
+ # Libraries to link to while building
+-LIBHDF5=$(top_builddir)/src/libhdf5.la
++LIBHDF5=$(top_builddir)/src/libhdf5 at FLAVOR@.la
+ LIBH5TEST=$(top_builddir)/test/libh5test.la
+-LIBH5F=$(top_builddir)/fortran/src/libhdf5_fortran.la
++LIBH5F=$(top_builddir)/fortran/src/libhdf5 at FLAVOR@_fortran.la
+ LIBH5FTEST=$(top_builddir)/fortran/test/libh5test_fortran.la
+ LIBH5CPP=$(top_builddir)/c++/src/libhdf5_cpp.la
+ LIBH5JNI=$(top_builddir)/java/src/jni/libhdf5_java.la
+ LIBH5TOOLS=$(top_builddir)/tools/lib/libh5tools.la
+-LIBH5_HL=$(top_builddir)/hl/src/libhdf5_hl.la
+-LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
++LIBH5_HL=$(top_builddir)/hl/src/libhdf5 at FLAVOR@_hl.la
++LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5 at FLAVOR@hl_fortran.la
+ LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
+
+ # Install directories that automake doesn't know about
diff --git a/debian/patches/path_max.diff b/debian/patches/path_max.diff
index e99d442..a86c76f 100644
--- a/debian/patches/path_max.diff
+++ b/debian/patches/path_max.diff
@@ -9,7 +9,7 @@ Index: hdf5/src/H5Fint.c
===================================================================
--- hdf5.orig/src/H5Fint.c
+++ hdf5/src/H5Fint.c
-@@ -1749,7 +1749,6 @@ H5F_build_actual_name(const H5F_t *f, co
+@@ -1756,7 +1756,6 @@ H5F_build_actual_name(const H5F_t *f, co
int *fd; /* POSIX I/O file descriptor */
h5_stat_t st; /* Stat info from stat() call */
h5_stat_t fst; /* Stat info from fstat() call */
@@ -17,7 +17,7 @@ Index: hdf5/src/H5Fint.c
hbool_t want_posix_fd; /* Flag for retrieving file descriptor from VFD */
/* Perform a sanity check that the file or link wasn't switched
-@@ -1786,12 +1785,8 @@ H5F_build_actual_name(const H5F_t *f, co
+@@ -1793,12 +1792,8 @@ H5F_build_actual_name(const H5F_t *f, co
HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "files' st_ino or st_dev fields changed!")
/* Get the resolved path for the file name */
diff --git a/debian/patches/relax-version-check.patch b/debian/patches/relax-version-check.patch
index 35ebaa4..2f90b0b 100644
--- a/debian/patches/relax-version-check.patch
+++ b/debian/patches/relax-version-check.patch
@@ -10,7 +10,7 @@ Index: hdf5/src/H5.c
===================================================================
--- hdf5.orig/src/H5.c
+++ hdf5/src/H5.c
-@@ -772,8 +772,7 @@ H5check_version(unsigned majnum, unsigne
+@@ -778,8 +778,7 @@ H5check_version(unsigned majnum, unsigne
disable_version_check = (unsigned int)HDstrtol (s, NULL, 0);
}
diff --git a/debian/rules b/debian/rules
index 1ba65b5..acaf678 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,9 +115,9 @@ export DH_OPTIONS += -Nlibhdf5-doc
endif
ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- USE_PROD = yes
+ USE_PROD = production
else
- USE_PROD = no
+ USE_PROD = debug
endif
# export DEB_BUILD_OPTIONS="parallel=2"
@@ -131,7 +131,7 @@ CONFIGURE_FLAGS = --prefix=/usr --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--mandir=\$${prefix}/share/man \
--with-pthread --enable-linux-lfs --enable-unsupported \
- --enable-shared --enable-production=$(USE_PROD) \
+ --enable-shared --enable-build-mode=$(USE_PROD) \
--disable-sharedlib-rpath --with-zlib --with-default-api-version=v18 \
--with-szlib \
--enable-fortran --enable-fortran2003
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf5.git
More information about the Pkg-grass-devel
mailing list