[coinutils] 03/03: patch for building with pkg-config

[Miles Lubin]

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

mlubin-guest pushed a commit to branch master
in repository coinutils.

commit f79dbf245d05be2d2b4883dec85df3f61ab9d223
Author: Miles Lubin <miles.lubin at gmail.com>
Date:   Wed Sep 25 18:31:28 2013 -0400

    patch for building with pkg-config
---
 debian/changelog                      |    1 +
 debian/patches/fix-addlibs-file.patch |   14 ++++++++++++++
 debian/patches/series                 |    1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5be3e34..3f2cb84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ coinutils (2.9.4-2) experimental; urgency=low
   * Purge license-incompatible files from previous maintainer.
     - Update copyright file.
   * Remove .la files. Reverse dependencies will be updated in experimental.
+  * Add patch to fix building with pkg-config.
 
  -- Miles Lubin <miles.lubin at gmail.com>  Wed, 25 Sep 2013 16:23:58 -0400
 
diff --git a/debian/patches/fix-addlibs-file.patch b/debian/patches/fix-addlibs-file.patch
new file mode 100644
index 0000000..c4dc8a1
--- /dev/null
+++ b/debian/patches/fix-addlibs-file.patch
@@ -0,0 +1,14 @@
+Author: Miles Lubin <miles.lubin at gmail.com>
+Description: Fix production of coinutils_addlibs.txt file.
+Bug: https://projects.coin-or.org/BuildTools/ticket/104 
+--- a/CoinUtils/Makefile.in
++++ b/CoinUtils/Makefile.in
+@@ -832,7 +832,7 @@
+ 
+ install-data-hook:
+ 	@$(mkdir_p) "$(addlibsdir)"
+- at COIN_HAS_PKGCONFIG_TRUE@	PKG_CONFIG_PATH="@COIN_PKG_CONFIG_PATH@" \
++ at COIN_HAS_PKGCONFIG_TRUE@	PKG_CONFIG_PATH=$(DESTDIR)$(pkgconfiglibdir) \
+ @COIN_HAS_PKGCONFIG_TRUE@	"$(PKG_CONFIG)" --libs coinutils > $(addlibsdir)/coinutils_addlibs.txt
+ @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@	echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCoinUtils.lib @COINUTILSLIB_LIBS_INSTALLED@" > $(addlibsdir)/coinutils_addlibs.txt
+ @COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@	echo -L at abs_lib_dir@ -lCoinUtils @COINUTILSLIB_LIBS_INSTALLED@ > $(addlibsdir)/coinutils_addlibs.txt
diff --git a/debian/patches/series b/debian/patches/series
index 5c24f68..d575889 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 format-security-fix.patch
+fix-addlibs-file.patch

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