[hdf5] 13/24: Fix missing @FLAVOR at hl -> @FLAVOR at _hl

Alastair McKinstry mckinstry at moszumanska.debian.org
Sun Jun 8 12:51:26 UTC 2014


This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch dev-alternatives
in repository hdf5.

commit 7fb634b7dd23e55c1f6b30f2e59ad1066e77f736
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Jun 4 01:53:20 2014 +0100

    Fix missing @FLAVOR at hl -> @FLAVOR at _hl
---
 debian/patches/flavor-configure-option.patch | 32 ++++++++++++++--------------
 debian/patches/version-script.patch          |  6 +++---
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/debian/patches/flavor-configure-option.patch b/debian/patches/flavor-configure-option.patch
index 4c183e1..4259f06 100644
--- a/debian/patches/flavor-configure-option.patch
+++ b/debian/patches/flavor-configure-option.patch
@@ -262,8 +262,8 @@ Index: hdf5/fortran/src/h5fc.in
    shared_link=""
  # conditionnaly link with the hl library
    if test "X$HL" = "Xhl"; then
--   libraries=" $libraries -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 "
-+   libraries=" $libraries -lhdf5 at FLAVOR@hl_fortran -lhdf5 at FLAVOR@_hl -lhdf5 at FLAVOR@_fortran -lhdf5 at FLAVOR@ "
+-   libraries=" $libraries -lhdf5_hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 "
++   libraries=" $libraries -lhdf5 at FLAVOR@_hl_fortran -lhdf5 at FLAVOR@_hl -lhdf5 at FLAVOR@_fortran -lhdf5 at FLAVOR@ "
    else
 -   libraries=" $libraries -lhdf5_fortran -lhdf5 "
 +   libraries=" $libraries -lhdf5 at FLAVOR@_fortran -lhdf5 at FLAVOR@ "
@@ -289,10 +289,10 @@ Index: hdf5/fortran/src/h5fc.in
 +        -lhdf5 at FLAVOR@_fortran)
 +          new_libraries="$new_libraries ${libdir}/libhdf5 at FLAVOR@_fortran.a"
            ;;
--        -lhdf5hl_fortran)
--          new_libraries="$new_libraries ${libdir}/libhdf5hl_fortran.a"
-+        -lhdf5 at FLAVOR@hl_fortran)
-+          new_libraries="$new_libraries ${libdir}/libhdf5 at FLAVOR@hl_fortran.a"
+-        -lhdf5_hl_fortran)
+-          new_libraries="$new_libraries ${libdir}/libhdf5_hl_fortran.a"
++        -lhdf5 at FLAVOR@_hl_fortran)
++          new_libraries="$new_libraries ${libdir}/libhdf5 at FLAVOR@_hl_fortran.a"
            ;;
          *)
            new_libraries="$new_libraries $lib"
@@ -394,12 +394,12 @@ Index: hdf5/hl/fortran/src/Makefile.am
  AM_FCFLAGS+=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src
  
  # Our main target, the high-level fortran library
--lib_LTLIBRARIES=libhdf5hl_fortran.la
-+lib_LTLIBRARIES=libhdf5 at FLAVOR@hl_fortran.la
+-lib_LTLIBRARIES=libhdf5_hl_fortran.la
++lib_LTLIBRARIES=libhdf5 at FLAVOR@_hl_fortran.la
  
  # Add libtool numbers to the HDF5 HL Fortran library (from config/lt_vers.am)
--libhdf5hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-+libhdf5 at FLAVOR@hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
+-libhdf5_hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
++libhdf5 at FLAVOR@_hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
  
  # Some Fortran compilers can't build shared libraries, so sometimes we
  # want to build a shared C library and a static Fortran library.  If so,
@@ -407,13 +407,13 @@ Index: hdf5/hl/fortran/src/Makefile.am
  #endif
  
  # List sources to include in the HDF5 HL Fortran library.
--libhdf5hl_fortran_la_SOURCES=H5DSfc.c H5LTfc.c  H5IMfc.c H5IMcc.c H5TBfc.c \
-+libhdf5 at FLAVOR@hl_fortran_la_SOURCES=H5DSfc.c H5LTfc.c  H5IMfc.c H5IMcc.c H5TBfc.c \
+-libhdf5_hl_fortran_la_SOURCES=H5DSfc.c H5LTfc.c  H5IMfc.c H5IMcc.c H5TBfc.c \
++libhdf5 at FLAVOR@_hl_fortran_la_SOURCES=H5DSfc.c H5LTfc.c  H5IMfc.c H5IMcc.c H5TBfc.c \
  	H5DSff.f90 H5LTff.f90 H5IMff.f90 H5TBff.f90
  
  # HDF5 HL Fortran library depends on HDF5 Library.
--libhdf5hl_fortran_la_LIBADD=$(LIBH5_HL) $(LIBH5F)
-+libhdf5 at FLAVOR@hl_fortran_la_LIBADD=$(LIBH5_HL) $(LIBH5F)
+-libhdf5_hl_fortran_la_LIBADD=$(LIBH5_HL) $(LIBH5F)
++libhdf5 at FLAVOR@_hl_fortran_la_LIBADD=$(LIBH5_HL) $(LIBH5F)
  
  # Fortran module files can have different extensions and different names
  # (e.g., different capitalizations) on different platforms.  Write rules
@@ -435,10 +435,10 @@ Index: hdf5/config/commence.am
 +LIBH5CPP=$(top_builddir)/c++/src/libhdf5 at FLAVOR@_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
+-LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5_hl_fortran.la
 -LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5_hl_cpp.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
++LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5 at FLAVOR@_hl_fortran.la
 +LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5 at FLAVOR@_hl_cpp.la
  
  # Install directories that automake doesn't know about
diff --git a/debian/patches/version-script.patch b/debian/patches/version-script.patch
index ba8ab4e..124d7a7 100644
--- a/debian/patches/version-script.patch
+++ b/debian/patches/version-script.patch
@@ -48,11 +48,11 @@ index dd0a079..35c474d 100644
 --- a/hl/fortran/src/Makefile.am
 +++ b/hl/fortran/src/Makefile.am
 @@ -30,7 +30,7 @@ AM_FCFLAGS+=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/s
- lib_LTLIBRARIES=libhdf5 at FLAVOR@hl_fortran.la
+ lib_LTLIBRARIES=libhdf5 at FLAVOR@_hl_fortran.la
  
  # Add libtool numbers to the HDF5 HL Fortran library (from config/lt_vers.am)
--libhdf5 at FLAVOR@hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-+libhdf5 at FLAVOR@hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) -Wl,--version-script,$(top_srcdir)/debian/map at FLAVOR@.ver
+-libhdf5 at FLAVOR@_hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
++libhdf5 at FLAVOR@_hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) -Wl,--version-script,$(top_srcdir)/debian/map at FLAVOR@.ver
  
  # Some Fortran compilers can't build shared libraries, so sometimes we
  # want to build a shared C library and a static Fortran library.  If so,

-- 
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