From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Mon, 23 Nov 2009 18:04:13 +0000 (+0000)
Subject: Work around mixed SSL libraries by linking in globus libssl explicitly.
X-Git-Tag: merge_313_7_src~2
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=1e9d4c984a821d523a237796aeba6ed34f4f747c;p=jra1mw.git

Work around mixed SSL libraries by linking in globus libssl explicitly.
Fixes bug #59393.
---

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index ee716a6..2bbc177 100644
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -117,9 +117,9 @@ INSTALL:=libtool --mode=install install
 LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/lib ${LDFLAGS}
 XSLTPROC:=xsltproc --novalid
 
+# hack to fix bug #59393
 GLOBUS_LIBS:= -L${globus_prefix}/lib \
-	-lglobus_common_${nothrflavour} \
-	-lglobus_gssapi_gsi_${nothrflavour} \
+	-lssl_${nothrflavour}
 
 #ifeq ($(shell ls ${gsoap_prefix}/bin/soapcpp2),${gsoap_prefix}/bin/soapcpp2)
 #	gsoap_bin_prefix := ${gsoap_prefix}/bin
@@ -168,6 +168,7 @@ ifneq (${classads_prefix},/usr)
 endif
 
 EXT_LIBS:=  \
+	${GLOBUS_LIBS} \
 	${mysqlib} -lmysqlclient -lz -lcares\
 	${GRIDSITE_LIBS} \
 	${classadslib} \
diff --git a/org.glite.lb.server/project/ChangeLog b/org.glite.lb.server/project/ChangeLog
index ad6822d..a8e14c4 100644
--- a/org.glite.lb.server/project/ChangeLog
+++ b/org.glite.lb.server/project/ChangeLog
@@ -50,6 +50,9 @@
 1.9.2-2
 - Module repacked
 
+1.9.3-2
+- Fix mixed SSL build (#59393)
+
 1.9.3-3
 - Module repacked