[coinor-cbc] 03/03: refresh fix-addlibs-file.patch
Miles Lubin
mlubin-guest at moszumanska.debian.org
Thu Sep 4 01:35:12 UTC 2014
This is an automated email from the git hooks/post-receive script.
mlubin-guest pushed a commit to branch master
in repository coinor-cbc.
commit 45c0e6c16c427d55aa1b0330426eea09b482eaab
Author: Miles Lubin <miles.lubin at gmail.com>
Date: Wed Sep 3 18:23:18 2014 -0400
refresh fix-addlibs-file.patch
---
debian/patches/fix-addlibs-file.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/patches/fix-addlibs-file.patch b/debian/patches/fix-addlibs-file.patch
index 624b20d..1d171b9 100644
--- a/debian/patches/fix-addlibs-file.patch
+++ b/debian/patches/fix-addlibs-file.patch
@@ -3,7 +3,7 @@ Description: Fix production of cbc_addlibs.txt file.
Bug: https://projects.coin-or.org/BuildTools/ticket/104
--- a/Makefile.in
+++ b/Makefile.in
-@@ -976,7 +976,7 @@
+@@ -980,7 +980,7 @@
install-data-hook:
@$(mkdir_p) "$(addlibsdir)"
@@ -11,4 +11,4 @@ Bug: https://projects.coin-or.org/BuildTools/ticket/104
+ at COIN_HAS_PKGCONFIG_TRUE@ PKG_CONFIG_PATH=$(DESTDIR)$(pkgconfiglibdir) \
@COIN_HAS_PKGCONFIG_TRUE@ $(PKG_CONFIG) --libs cbc > $(addlibsdir)/cbc_addlibs.txt
@COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs.txt
- @COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@ echo -L at abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
+ @COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@ echo -L at abs_lib_dir@ -lCbcSolver -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/coinor-cbc.git
More information about the debian-science-commits
mailing list