This is an automated email from the git hooks/post-receive script. johanvdw-guest pushed a commit to branch experimental in repository hdf4.
commit e990eb6f3893afaa65af34b60315e7fc7deb37de Author: Johan Van de Wauw <johan.vandew...@gmail.com> Date: Tue Mar 3 10:53:47 2015 +0100 Use quilt for all version, patch for specific changes More changes Conflicts: debian/rules Fix fortran enable patch --- debian/patches/enablesharedfortran.diff | 28 ++++++++++++++++++++++++++++ debian/patches/series | 3 +-- debian/patches/shared_fortran | 14 +++++++++----- debian/rules | 25 +++++-------------------- 4 files changed, 43 insertions(+), 27 deletions(-) diff --git a/debian/patches/enablesharedfortran.diff b/debian/patches/enablesharedfortran.diff new file mode 100644 index 0000000..8877a73 --- /dev/null +++ b/debian/patches/enablesharedfortran.diff @@ -0,0 +1,28 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -224,15 +224,16 @@ AC_SUBST([BUILD_FORTRAN]) + ## Build static libraries by default. Furthermore, fortran shared libraries + ## are unsupported. Disallow a user from enabling both shared libraries and + ## fortran. +-if test "X${enable_shared}" != "Xyes"; then +- enable_shared="no" +-fi +- +-if test "X${enable_shared}" = "Xyes"; then +- if test "X${BUILD_FORTRAN}" = "Xyes"; then +- AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure with --disable-fortran flag.]) +- fi +-fi ++#this test is overwritten in debian - we allow shared fortran libraries ++#if test "X${enable_shared}" != "Xyes"; then ++# enable_shared="no" ++#fi ++# ++#if test "X${enable_shared}" = "Xyes"; then ++# if test "X${BUILD_FORTRAN}" = "Xyes"; then ++# AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure with --disable-fortran flag.]) ++# fi ++#fi + + AC_PROG_INSTALL + AC_PROG_LN_S diff --git a/debian/patches/series b/debian/patches/series index 4096881..6507f6e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -config-updates.diff #fmpool man 64bit @@ -10,4 +9,4 @@ hdf-4.2.10-aarch64.patch install-examples.diff missing-includes.diff ppc64el.patch - +enablesharedfortran.diff diff --git a/debian/patches/shared_fortran b/debian/patches/shared_fortran index d9ef291..bcfddc8 100644 --- a/debian/patches/shared_fortran +++ b/debian/patches/shared_fortran @@ -2,16 +2,20 @@ Index: b/HDF4/configure.ac =================================================================== --- a/HDF4/configure.ac +++ b/HDF4/configure.ac -@@ -228,12 +228,6 @@ - enable_shared="no" - fi - +@@ -224,15 +224,6 @@ AC_SUBST([BUILD_FORTRAN]) + ## Build static libraries by default. Furthermore, fortran shared libraries + ## are unsupported. Disallow a user from enabling both shared libraries and + ## fortran. +-if test "X${enable_shared}" != "Xyes"; then +- enable_shared="no" +-fi +- -if test "X${enable_shared}" = "Xyes"; then - if test "X${BUILD_FORTRAN}" = "Xyes"; then - AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure with --disable-fortran flag.]) - fi -fi -- + AC_PROG_INSTALL AC_PROG_LN_S diff --git a/debian/rules b/debian/rules index 6145526..8e0efd6 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ # more information about the license. # -RELEASE := 4.2.11 +RELEASE := 4.2.11 ARCHIVE := upstream/HDF$(RELEASE).tar.gz PACKAGE := libhdf4 SOVER := 0 @@ -41,34 +41,19 @@ install-doc: stamps/install-doc-stamp binary: debian/control binary-indep binary-arch stamps/unpack-stamp: debian/control - dh_testdir - mkdir HDF$(RELEASE) - bash debian/copysources.sh $(RELEASE) mkdir -p stamps touch $@ stamps/patch-stamp: stamps/unpack-stamp dh_testdir - rm -f HDF4 && mv -f HDF$(RELEASE) HDF4 - # create alternative patches on fly - cp -a debian/patches debian/patches1 - cp -a debian/patches debian/patches2 - # add a patch to series - mv -f HDF4 HDF$(RELEASE) - patch <debian/patches/autotools - mv -f HDF4 HDF4_ALT + mkdir HDF$(RELEASE) + bash debian/copysources.sh $(RELEASE) + rm -f HDF4 && ln -sf HDF$(RELEASE) HDF4 + #patch <debian/patches/autotools --follow-symlinks touch $@ unpatch: dh_testdir - rm -f HDF4 && ln -sf HDF$(RELEASE) HDF4 - mv -f .pc1 .pc - QUILT_PATCH_OPTS="-p1" QUILT_PATCHES=debian/patches1 quilt pop -a || true - mv -f .pc .pc1 - rm -rf HDF4 && ln -sf HDF4_ALT HDF4 && mv .pc2 .pc - QUILT_PATCH_OPTS="-p1" QUILT_PATCHES=debian/patches2 quilt pop -a || true - mv -f .pc .pc2 - rm -rf $(CURDIR)/stamps/patch-stamp HDF4 .pc .pc1 .pc2 $(CURDIR)/debian/patches1 $(CURDIR)/debian/patches2 configure: stamps/configure-stamp stamps/configure-stamp: patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf4.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel