[hdf5] 18/24: Don't add @FLAVOR@ to cpp packages

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 9344dea441d9bd59bda17e49fd8fedc2d0385c95
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Jun 4 07:57:59 2014 +0100

    Don't add @FLAVOR@ to cpp packages
---
 debian/patches/flavor-configure-option.patch | 32 ++++++++++++++--------------
 debian/patches/version-script.patch          | 12 +++++------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/debian/patches/flavor-configure-option.patch b/debian/patches/flavor-configure-option.patch
index 632f270..6aa9153 100644
--- a/debian/patches/flavor-configure-option.patch
+++ b/debian/patches/flavor-configure-option.patch
@@ -168,11 +168,11 @@ Index: hdf5-1.8.13+docs/c++/src/Makefile.am
  
  # This is our main target
 -lib_LTLIBRARIES=libhdf5_cpp.la
-+lib_LTLIBRARIES=libhdf5 at FLAVOR@_cpp.la
++lib_LTLIBRARIES=libhdf5_cpp.la
  
  # Add libtool numbers to the HDF5 C++ library (from config/lt_vers.am)
 -libhdf5_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-+libhdf5 at FLAVOR@_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
++libhdf5_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
  
  # Shared C++ libraries aren't universally supported.
  if CXX_SHARED_CONDITIONAL
@@ -181,7 +181,7 @@ Index: hdf5-1.8.13+docs/c++/src/Makefile.am
  
  # Source files for the library
 -libhdf5_cpp_la_SOURCES=H5Exception.cpp H5IdComponent.cpp H5Library.cpp        \
-+libhdf5 at FLAVOR@_cpp_la_SOURCES=H5Exception.cpp H5IdComponent.cpp H5Library.cpp        \
++libhdf5_cpp_la_SOURCES=H5Exception.cpp H5IdComponent.cpp H5Library.cpp        \
          H5Attribute.cpp H5Location.cpp H5Object.cpp H5PropList.cpp	      \
  	H5FaccProp.cpp H5FcreatProp.cpp H5DcreatProp.cpp H5DxferProp.cpp      \
  	H5DataType.cpp H5DataSpace.cpp H5AbstractDs.cpp H5AtomType.cpp        \
@@ -190,7 +190,7 @@ Index: hdf5-1.8.13+docs/c++/src/Makefile.am
  
  # HDF5 C++ library depends on HDF5 Library.
 -libhdf5_cpp_la_LIBADD=$(LIBHDF5)
-+libhdf5 at FLAVOR@_cpp_la_LIBADD=$(LIBHDF5)
++libhdf5_cpp_la_LIBADD=$(LIBHDF5)
  
  # Public headers
  include_HEADERS=H5Cpp.h H5AbstractDs.h H5AtomType.h H5Attribute.h H5Classes.h \
@@ -212,10 +212,10 @@ Index: hdf5-1.8.13+docs/c++/src/h5c++.in
    # conditionnaly link with the hl library  
    if test "X$HL" = "Xhl"; then
 -   libraries=" $libraries -lhdf5_hl_cpp -lhdf5_cpp -lhdf5_hl -lhdf5 "
-+   libraries=" $libraries -lhdf5 at FLAVOR@_hl_cpp -lhdf5 at FLAVOR@_cpp -lhdf5 at FLAVOR@_hl -lhdf5 at FLAVOR@ "
++   libraries=" $libraries -lhdf5_hl_cpp -lhdf5_cpp -lhdf5 at FLAVOR@_hl -lhdf5 at FLAVOR@ "
    else
 -   libraries=" $libraries -lhdf5_cpp -lhdf5 "
-+   libraries=" $libraries -lhdf5 at FLAVOR@_cpp -lhdf5 at FLAVOR@ "
++   libraries=" $libraries -lhdf5_cpp -lhdf5 at FLAVOR@ "
    fi
    link_args="$link_args -L${libdir}"
  
@@ -235,13 +235,13 @@ Index: hdf5-1.8.13+docs/c++/src/h5c++.in
            ;;
 -        -lhdf5_cpp)
 -          new_libraries="$new_libraries ${libdir}/libhdf5_cpp.a"
-+        -lhdf5 at FLAVOR@_cpp)
-+          new_libraries="$new_libraries ${libdir}/libhdf5 at FLAVOR@_cpp.a"
++        -lhdf5_cpp)
++          new_libraries="$new_libraries ${libdir}/libhdf5_cpp.a"
            ;;
 -        -lhdf5_hl_cpp)
 -          new_libraries="$new_libraries ${libdir}/libhdf5_hl_cpp.a"
-+        -lhdf5 at FLAVOR@_hl_cpp)
-+          new_libraries="$new_libraries ${libdir}/libhdf5 at FLAVOR@_hl_cpp.a"
++        -lhdf5_hl_cpp)
++          new_libraries="$new_libraries ${libdir}/libhdf5_hl_cpp.a"
            ;;
          *)
            new_libraries="$new_libraries $lib"
@@ -360,11 +360,11 @@ Index: hdf5-1.8.13+docs/hl/c++/src/Makefile.am
  
  # This is our main target
 -lib_LTLIBRARIES=libhdf5_hl_cpp.la
-+lib_LTLIBRARIES=libhdf5 at FLAVOR@_hl_cpp.la
++lib_LTLIBRARIES=libhdf5_hl_cpp.la
  
  # Add libtool numbers to the HDF5 HL C++ library (from config/lt_vers.am)
 -libhdf5_hl_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-+libhdf5 at FLAVOR@_hl_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
++libhdf5_hl_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
  
  # Shared C++ libraries aren't universally supported.
  if CXX_SHARED_CONDITIONAL
@@ -373,11 +373,11 @@ Index: hdf5-1.8.13+docs/hl/c++/src/Makefile.am
  # Source files for the library
  # At the moment, only the H5PT Packet Table has a C++ API.
 -libhdf5_hl_cpp_la_SOURCES=H5PacketTable.cpp
-+libhdf5 at FLAVOR@_hl_cpp_la_SOURCES=H5PacketTable.cpp
++libhdf5_hl_cpp_la_SOURCES=H5PacketTable.cpp
  
  # HDF5 HL C++ library depends on HDF5 Library.
 -libhdf5_hl_cpp_la_LIBADD=$(LIBH5_HL) $(LIBH5CPP)
-+libhdf5 at FLAVOR@_hl_cpp_la_LIBADD=$(LIBH5_HL) $(LIBH5CPP)
++libhdf5_hl_cpp_la_LIBADD=$(LIBH5_HL) $(LIBH5CPP)
  
  # Public headers
  include_HEADERS=H5PacketTable.h
@@ -396,14 +396,14 @@ Index: hdf5-1.8.13+docs/config/commence.am
 +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
-+LIBH5CPP=$(top_builddir)/c++/src/libhdf5 at FLAVOR@_cpp.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
 -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
-+LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5 at FLAVOR@_hl_cpp.la
++LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
  
  # Install directories that automake doesn't know about
  docdir = $(exec_prefix)/doc
diff --git a/debian/patches/version-script.patch b/debian/patches/version-script.patch
index 124d7a7..c8d927e 100644
--- a/debian/patches/version-script.patch
+++ b/debian/patches/version-script.patch
@@ -9,11 +9,11 @@ index 0ebea7a..a9c2da5 100644
 --- a/c++/src/Makefile.am
 +++ b/c++/src/Makefile.am
 @@ -28,7 +28,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src
- lib_LTLIBRARIES=libhdf5 at FLAVOR@_cpp.la
+ lib_LTLIBRARIES=libhdf5_cpp.la
  
  # Add libtool numbers to the HDF5 C++ library (from config/lt_vers.am)
--libhdf5 at FLAVOR@_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-+libhdf5 at FLAVOR@_cpp_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_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
++libhdf5_cpp_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
  
  # Shared C++ libraries aren't universally supported.
  if CXX_SHARED_CONDITIONAL
@@ -35,11 +35,11 @@ index e8b37fd..d86f813 100644
 --- a/hl/c++/src/Makefile.am
 +++ b/hl/c++/src/Makefile.am
 @@ -28,7 +28,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src
- lib_LTLIBRARIES=libhdf5 at FLAVOR@_hl_cpp.la
+ lib_LTLIBRARIES=libhdf5_hl_cpp.la
  
  # Add libtool numbers to the HDF5 HL C++ library (from config/lt_vers.am)
--libhdf5 at FLAVOR@_hl_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-+libhdf5 at FLAVOR@_hl_cpp_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_hl_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
++libhdf5_hl_cpp_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
  
  # Shared C++ libraries aren't universally supported.
  if CXX_SHARED_CONDITIONAL

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