1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
From 56bc636d4a2a7892f1a78c3702f8703cf7ce93b4 Mon Sep 17 00:00:00 2001
From: Peter Alfredsen <loki_val@gentoo.org>
Date: Thu, 22 Jan 2009 13:24:46 +0100
Subject: [PATCH 02/10] Fixup abyss compilation; add lpthread and make parallel compile work.
---
lib/abyss/src/Makefile | 14 +++++++-------
src/cpp/Makefile | 6 +++++-
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/lib/abyss/src/Makefile b/lib/abyss/src/Makefile
index cbb187e..da6ff1b 100644
--- a/lib/abyss/src/Makefile
+++ b/lib/abyss/src/Makefile
@@ -59,11 +59,6 @@ ABYSS_SHLIB = $(call shlibfn,libxmlrpc_abyss)
ABYSS_SHLIBLE = $(call shliblefn,libxmlrpc_abyss)
#ABYSS_SHLIBLE is e.g. libxmlrpc_abyss.so
-# LIBDEP is the shared libraries on which libxmlrpc_abyss depends.
-# The runtime loader should load these libraries when it loads libxmlrpc_abyss.
-
-LIBDEP = $(LIBXMLRPC_UTIL)
-
ifneq ($(SHARED_LIB_TYPE),NONE)
TARGET_SHARED_LIBS := $(ABYSS_SHLIB) $(ABYSS_SHLIBLE)
endif
@@ -78,8 +73,13 @@ all: libxmlrpc_abyss.a $(TARGET_SHARED_LIBS) $(TARGET_SHARED_LE_LIBS)
# Rule for this is in common.mk, courtesy of TARGET_SHARED_LIBRARIES:
-$(ABYSS_SHLIB): $(TARGET_MODS:%=%.osh) $(LIBDEP)
-$(ABYSS_SHLIB): LIBOBJECTS = $(TARGET_MODS:%=%.osh) $(LIBDEP)
+$(ABYSS_SHLIB): $(TARGET_MODS:%=%.osh) \
+ $(LIBXMLRPC_UTIL)
+$(ABYSS_SHLIB): LIBOBJECTS = $(TARGET_MODS:%=%.osh)
+$(ABYSS_SHLIB): LIBDEP = -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
+ifeq ($(ENABLE_ABYSS_THREADS),yes)
+ $(ABYSS_SHLIB): LIBDEP += -lpthread
+endif
# Rule for this is in common.mk, courtesy of TARGET_STATIC_LIBRARIES:
diff --git a/src/cpp/Makefile b/src/cpp/Makefile
index ebffe7c..e08f47c 100644
--- a/src/cpp/Makefile
+++ b/src/cpp/Makefile
@@ -143,10 +143,14 @@ LIBXMLRPC_SERVER_ABYSSPP_SH = $(call shlibfn, libxmlrpc_server_abyss++)
$(LIBXMLRPC_SERVER_ABYSSPP_SH): $(LIBXMLRPC_SERVER_ABYSSPP_MODS:%=%.osh) \
$(LIBXMLRPC_ABYSS) \
+ $(LIBXMLRPC_SERVER_ABYSS) \
+ $(call shliblefn, lib$(LIBXMLRPCPP_NAME)) \
+ $(call shlibfn, libxmlrpc_server++) \
+ $(LIBXMLRPC_UTIL) \
$(LIBXMLRPC)
$(LIBXMLRPC_SERVER_ABYSSPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVER_ABYSSPP_MODS:%=%.osh)
$(LIBXMLRPC_SERVER_ABYSSPP_SH): LIBDEP = \
- -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss -Lblddir/src -lxmlrpc
+ -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss -Lblddir/src -lxmlrpc_server_abyss -lxmlrpc -L. -l$(LIBXMLRPCPP_NAME) -lxmlrpc_server++ -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
LIBXMLRPC_SERVER_CGIPP_SH = $(call shlibfn, libxmlrpc_server_cgi++)
--
1.6.1
|
GitWeb
