From a470d57b7a5c67552ff335affa352ed76202e11a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Sun, 20 Nov 2011 22:30:43 +0000 Subject: [PATCH] Build on Fedora. --- org.glite.lb.client-java/configure | 4 ++-- org.glite.lb.client/Makefile | 2 +- org.glite.lb.logger/Makefile | 10 +++++----- org.glite.lb/configure | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/org.glite.lb.client-java/configure b/org.glite.lb.client-java/configure index f9f51ca..e3f7740 100755 --- a/org.glite.lb.client-java/configure +++ b/org.glite.lb.client-java/configure @@ -138,7 +138,7 @@ my %externs = ( }, jdk => { prefix=> '/usr/java/latest', - locations => [ '/usr/java/latest', '/usr/lib/jvm/java' ], + locations => [ '/usr/lib/jvm/java', '/usr/java/latest' ], }, libtar => { prefix=> '/usr' @@ -623,7 +623,7 @@ for my $jar (keys %need_jars) { lb.utils:R / ], 'lb.server' => [ qw/ - lb.ws-interface lb.types:B lb.common lb.state-machine + lb.ws-interface lb.types:B lb.common lb.state-machine lb.utils:R lbjp-common.db lbjp-common.server-bones lbjp-common.trio lbjp-common.maildir lbjp-common.log jobid.api-c lbjp-common.gsoap-plugin lbjp-common.gss diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile index ef8f1c7..6c1d1fa 100644 --- a/org.glite.lb.client/Makefile +++ b/org.glite.lb.client/Makefile @@ -248,7 +248,7 @@ ${TOOLS} ${EXAMPLES} ${EXAMPLES_CL}: %: %.o ${LINK} -o $@ $< ${default_clientlib} ${default_commonlib} ${EXT_LIB} ${EXAMPLES_CL_THR}: %: %.o - ${LINK} -o $@ $< ${default_clientlib_thr} ${default_commonlib_thr} ${EXT_LIB} + ${LINK} -o $@ $< ${default_clientlib_thr} ${default_commonlib_thr} ${EXT_LIB} -lpthread ${TOOLS}: ${default_clientlib} diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile index b9c7c4b..599e6a1 100644 --- a/org.glite.lb.logger/Makefile +++ b/org.glite.lb.logger/Makefile @@ -147,19 +147,19 @@ glite-lb-logd-perf-nofile: ${LOGD_NOBJS} ${LINK} -o $@ ${LOGD_NOBJS} ${COMMON_LIB}${default_nothrflavour} ${EXT_LIB} glite-lb-interlogd: ${INTERLOG_OBJS} - ${LINK} -o $@ ${INTERLOG_OBJS} ${COMMON_LIB}${default_thrflavour} ${EXT_LIB} + ${LINK} -o $@ ${INTERLOG_OBJS} ${COMMON_LIB}${default_thrflavour} ${EXT_LIB} -lpthread glite-lb-notif-interlogd: ${INTERLOG_NOTIF_OBJS} - ${LINK} -export-dynamic -o $@ ${INTERLOG_NOTIF_OBJS} ${COMMON_LIB}${default_thrflavour} ${EXT_LIB} + ${LINK} -export-dynamic -o $@ ${INTERLOG_NOTIF_OBJS} ${COMMON_LIB}${default_thrflavour} ${EXT_LIB} -lpthread glite-lb-interlogd-perf: ${INTERLOG_PERF_OBJS} - ${LINK} -o $@ ${INTERLOG_PERF_OBJS} ${COMMON_LIB}${default_thrflavour} ${EXT_LIB} + ${LINK} -o $@ ${INTERLOG_PERF_OBJS} ${COMMON_LIB}${default_thrflavour} ${EXT_LIB} -lpthread glite-lb-interlogd-perf-empty: ${INTERLOG_EMPTY_OBJS} - ${LINK} -o $@ ${INTERLOG_EMPTY_OBJS} ${COMMON_LIB}${default_thrflavour} ${EXT_LIB} + ${LINK} -o $@ ${INTERLOG_EMPTY_OBJS} ${COMMON_LIB}${default_thrflavour} ${EXT_LIB} -lpthread glite-lb-ws-interlogd: ${INTERLOG_WS_OBJS} - ${LINK} -o $@ ${INTERLOG_WS_OBJS} ${COMMON_LIB}${default_thrflavour} ${EXT_LIB} + ${LINK} -o $@ ${INTERLOG_WS_OBJS} ${COMMON_LIB}${default_thrflavour} ${EXT_LIB} -lpthread #glite-lb-interlogd-perf-inline-empty: ${INTERLOG_INLINE_EMPTY_OBJS} # ${LINK} -o $@ ${INTERLOG_INLINE_EMPTY_OBJS} \ diff --git a/org.glite.lb/configure b/org.glite.lb/configure index fa93b64..e3f7740 100755 --- a/org.glite.lb/configure +++ b/org.glite.lb/configure @@ -138,7 +138,7 @@ my %externs = ( }, jdk => { prefix=> '/usr/java/latest', - locations => [ '/usr/java/latest', '/usr/lib/jvm/java' ], + locations => [ '/usr/lib/jvm/java', '/usr/java/latest' ], }, libtar => { prefix=> '/usr' -- 1.8.2.3