[magics] 08/10: Add args to ecbuild_pkgconfig()

Alastair McKinstry mckinstry at moszumanska.debian.org
Sun Jan 10 15:59:10 UTC 2016


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

mckinstry pushed a commit to branch debian/master
in repository magics.

commit 22abc621f6786dfa0264a942e56a75e229bbfae9
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Jan 9 23:42:10 2016 +0000

    Add args to ecbuild_pkgconfig()
---
 debian/patches/pkgconfig-fix.patch | 39 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 2 files changed, 40 insertions(+)

diff --git a/debian/patches/pkgconfig-fix.patch b/debian/patches/pkgconfig-fix.patch
new file mode 100644
index 0000000..3d34031
--- /dev/null
+++ b/debian/patches/pkgconfig-fix.patch
@@ -0,0 +1,39 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Need args for ecbuild_pkgconfig() to work
+Last-Updated: 2016-01-09
+Forwarded: no
+
+Index: magics++-2.26.2/cmake/ecbuild_pkgconfig.cmake
+===================================================================
+--- magics++-2.26.2.orig/cmake/ecbuild_pkgconfig.cmake
++++ magics++-2.26.2/cmake/ecbuild_pkgconfig.cmake
+@@ -12,8 +12,11 @@
+ # to CMake variable ${dependencies}
+ function( ecbuild_library_dependencies dependencies libraries )
+ 
++  message(WARNING "DEBUG ecbuild_library_dependencies ${dependencies} libs ${libraries}")
+   set( _libraries ${${libraries}} )
+ 
++  message(WARNING "DEBUG _libraries ${_libraries}")
++  
+   foreach( _lib ${_libraries})
+ 
+     unset( _location )
+Index: magics++-2.26.2/CMakeLists.txt
+===================================================================
+--- magics++-2.26.2.orig/CMakeLists.txt
++++ magics++-2.26.2/CMakeLists.txt
+@@ -326,7 +326,12 @@ ecbuild_add_resources( TARGET internal
+ 
+ set( MAGICS_DESCRIPTION "Multi-platform meteorological graphics library" )
+ set( MAGICS_URL "https://software.ecmwf.int/wiki/display/MAGP/Magics" )
+-ecbuild_pkgconfig()
++ecbuild_pkgconfig(
++  NAME magics
++  URL         "https://software.ecmwf.int/wiki/display/MAGP/Magics"
++  DESCRIPTION "ECMWF meteorological plotting software library"
++  LANGUAGES   C++
++  LIBRARIES   MagPlusShared MagPlusSingleShared MagPlusDoubleShared MagPlusStatic MagPlusSingleStatic MagPlusDoubleStatic MagWrappe )
+ 
+ ecbuild_install_project( NAME Magics )
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1636978..bbd0d49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ terralib.patch
 soname-version.patch
 reproducibility.patch
 compile-fixes.patch
+pkgconfig-fix.patch

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



More information about the debian-science-commits mailing list