[emos] 21/37: WIP: fixes, pkgconfig

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository emos.

commit 168eb93c5b8add1ddcec1c88352fe8a4849fcd25
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue May 26 01:22:29 2015 +0100

    WIP: fixes, pkgconfig
---
 debian/patches/pkgconfig.patch | 49 ++++++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
index ff9ac5c..f37d79a 100644
--- a/debian/patches/pkgconfig.patch
+++ b/debian/patches/pkgconfig.patch
@@ -3,32 +3,29 @@ Author: Alastair McKinstry <mckinstry at debian.org>
 Last-Updated: 2015-05-13
 Forwarded: no
 
-Index: emoslib-000403+dfsg.1/CMakeLists.txt
+Index: emoslib-4.0.3+dfsg.1/CMakeLists.txt
 ===================================================================
---- emoslib-000403+dfsg.1.orig/CMakeLists.txt
-+++ emoslib-000403+dfsg.1/CMakeLists.txt
+--- emoslib-4.0.3+dfsg.1.orig/CMakeLists.txt
++++ emoslib-4.0.3+dfsg.1/CMakeLists.txt
 @@ -129,6 +129,13 @@ endif()
  
  ecbuild_generate_config_headers( DESTINATION ${INSTALL_INCLUDE_DIR}/libemos )
  
 +ecbuild_pkgconfig(NAME emos 
-+                  DESCRIPTION "ECMWF Interpolation and query library" 
++                  TEMPLATE ${ECBUILD_CMAKE_DIR}/emos.pc.in
 +                  URL https://software.ecmwf.int/wiki/display/EMOS/Emoslib)
 +ecbuild_pkgconfig(NAME emosR64
-+                  DESCRIPTION "ECMWF Interpolation and query library" 
++                  TEMPLATE ${ECBUILD_CMAKE_DIR}/emosR64.pc.in
 +                  URL https://software.ecmwf.int/wiki/display/EMOS/Emoslib)
 +
  configure_file( libemos_config.h.in  libemos_config.h  @ONLY )
  configure_file( libemos_version.h.in libemos_version.h @ONLY )
  configure_file( libemos_version.c.in libemos_version.c @ONLY )
-Index: emoslib-000403+dfsg.1/cmake/emos.pc.in
+Index: emoslib-4.0.3+dfsg.1/cmake/emos.pc.in
 ===================================================================
 --- /dev/null
-+++ emoslib-000403+dfsg.1/cmake/emos.pc.in
-@@ -0,0 +1,35 @@
-+# This pkg-config file is generated by ecbuild_pkgconfig()
-+# with template ecbuild/cmake/pkg-config.pc.in
-+
++++ emoslib-4.0.3+dfsg.1/cmake/emos.pc.in
+@@ -0,0 +1,32 @@
 +git_tag=@PKGCONFIG_GIT_TAG@
 +
 +prefix=@CMAKE_INSTALL_PREFIX@
@@ -49,7 +46,7 @@ Index: emoslib-000403+dfsg.1/cmake/emos.pc.in
 +libs_private=-lemos -lgfortran -lm
 +
 +cflags=-I${prefix}/include/pbio -I${prefix}/include/interpolation -I${prefix}/include/gribex
-+ at PKGCONFIG_VARIABLES@
++
 +#====================================================================
 +Name: emos
 +Description: ECMWF Interpolation library
@@ -61,14 +58,11 @@ Index: emoslib-000403+dfsg.1/cmake/emos.pc.in
 +Requires.private: @PKGCONFIG_REQUIRES_PRIVATE@
 +Cflags: ${cflags}
 +#====================================================================
-Index: emoslib-000403+dfsg.1/cmake/emosR64.pc.in
+Index: emoslib-4.0.3+dfsg.1/cmake/emosR64.pc.in
 ===================================================================
 --- /dev/null
-+++ emoslib-000403+dfsg.1/cmake/emosR64.pc.in
-@@ -0,0 +1,35 @@
-+# This pkg-config file is generated by ecbuild_pkgconfig()
-+# with template ecbuild/cmake/pkg-config.pc.in
-+
++++ emoslib-4.0.3+dfsg.1/cmake/emosR64.pc.in
+@@ -0,0 +1,32 @@
 +git_tag=@PKGCONFIG_GIT_TAG@
 +
 +prefix=@CMAKE_INSTALL_PREFIX@
@@ -89,7 +83,7 @@ Index: emoslib-000403+dfsg.1/cmake/emosR64.pc.in
 +libs_private=-lemosR64 -lgfortran -lm
 +
 +cflags=-I${prefix}/include/pbio -I${prefix}/include/interpolation -I${prefix}/include/gribex
-+ at PKGCONFIG_VARIABLES@
++
 +#====================================================================
 +Name: emosR64
 +Description: ECMWF Interpolation library
@@ -101,3 +95,20 @@ Index: emoslib-000403+dfsg.1/cmake/emosR64.pc.in
 +Requires.private: @PKGCONFIG_REQUIRES_PRIVATE@
 +Cflags: ${cflags}
 +#====================================================================
+Index: emoslib-4.0.3+dfsg.1/cmake/ecbuild_pkgconfig.cmake
+===================================================================
+--- emoslib-4.0.3+dfsg.1.orig/cmake/ecbuild_pkgconfig.cmake
++++ emoslib-4.0.3+dfsg.1/cmake/ecbuild_pkgconfig.cmake
+@@ -358,8 +358,9 @@ function( ecbuild_pkgconfig )
+   configure_file( ${_PAR_TEMPLATE} "${CMAKE_BINARY_DIR}/${_PAR_FILEPATH}" @ONLY )
+   message( STATUS "pkg-config file created: ${_PAR_FILEPATH}" )
+ 
+-  install( FILES ${CMAKE_BINARY_DIR}/${_PAR_FILEPATH}
+-           DESTINATION ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/pkgconfig/
+-           COMPONENT utilities )
++  # FIXME: AMcK: bypass, this isn't picking up CMAKE_INSTALL_PREFIX properly
++  #install( FILES ${CMAKE_BINARY_DIR}/${_PAR_FILEPATH}
++  #         DESTINATION ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/pkgconfig/
++  #         COMPONENT utilities )
+ 
+ endfunction(ecbuild_pkgconfig)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/emos.git