[packages/qpid-cpp] - enhanced link patch to kill -L/usr/{lib,lib64}/{corosync,openais} - fixed configure/make glue typo

qboosh qboosh at pld-linux.org
Sat Sep 8 11:36:44 CEST 2012


commit 1befdc27cb9e9664d4fda340e4c4dc59245453ed
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 8 11:37:12 2012 +0200

    - enhanced link patch to kill -L/usr/{lib,lib64}/{corosync,openais}
    - fixed configure/make glue typo

 qpid-cpp-link.patch | 8 ++++++++
 qpid-cpp.spec       | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
---
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index 0b0db3b..ead12fb 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -199,7 +199,7 @@ Wiązania języka Ruby do bibliotek Qpid/C++.
 	%{?with_static_libs:--enable-static} \
 	--with-cpg%{!?with_corosync:=no} \
 	--with-cman%{!?with_cman:=no} \
-	--with-rdma%{!?with_rdma:=no} \
+	--with-rdma%{!?with_rdma:=no}
 %{__make}
 
 %install
diff --git a/qpid-cpp-link.patch b/qpid-cpp-link.patch
index dc42f2d..6c8bef7 100644
--- a/qpid-cpp-link.patch
+++ b/qpid-cpp-link.patch
@@ -19,6 +19,14 @@
    $(posix_broker_src) \
 --- qpidc-0.16/configure.ac.orig	2012-04-12 22:13:46.000000000 +0200
 +++ qpidc-0.16/configure.ac	2012-07-31 21:04:30.774091602 +0200
+@@ -259,7 +259,6 @@
+ # Check for optional cluster requirements.
+ tmp_LIBS=$LIBS
+ tmp_LDFLAGS=$LDFLAGS
+-LDFLAGS="$LDFLAGS -L/usr/lib/openais -L/usr/lib64/openais -L/usr/lib/corosync -L/usr/lib64/corosync"
+ AC_CHECK_LIB([cpg],[cpg_local_get],[have_libcpg=yes],)
+ AC_CHECK_HEADERS([openais/cpg.h corosync/cpg.h],[have_cpg_h=yes],)
+ AC_ARG_WITH([cpg],  
 @@ -532,8 +532,8 @@
  LIBS=$gl_saved_libs
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qpid-cpp.git/commitdiff/1befdc27cb9e9664d4fda340e4c4dc59245453ed



More information about the pld-cvs-commit mailing list