Group :: Sistema/Bibliotecas
RPM: xmlrpc-c
Main Changelog Spec Patches Sources Download Gear Bugs e FR Repocop
Patch: xmlrpc-c-1.12.00-alt-link-fixes.patch
Download
Download
--- xmlrpc-c/lib/abyss/src/Makefile.orig 2007-03-01 06:05:55 +0500
+++ xmlrpc-c/lib/abyss/src/Makefile 2007-10-22 01:33:02 +0600
@@ -66,6 +66,10 @@ ifneq ($(SHARED_LIB_TYPE),NONE)
TARGET_SHARED_LIBS := $(ABYSS_SHLIB) $(ABYSS_SHLIBLE)
endif
+ifeq ($(ENABLE_ABYSS_THREADS),yes)
+ LIBDEP += -lpthread
+endif
+
# This 'Makefile.common' dependency makes sure the symlinks get built before
# this make file is used for anything.
--- xmlrpc-c/src/cpp/Makefile.orig 2007-05-21 01:54:26 +0600
+++ xmlrpc-c/src/cpp/Makefile 2007-10-22 01:50:08 +0600
@@ -108,25 +108,34 @@ all: \
# RULES TO LINK LIBRARIES
#-----------------------------------------------------------------------------
+XMLRPC_LIBS = -L$(SRCDIR)/src/.libs -lxmlrpc
+XMLRPC_UTIL_LIBS = -L$(SRCDIR)/lib/libutil -lxmlrpc_util
+XMLRPC_SERVER_LIBS = -L$(SRCDIR)/src/.libs -lxmlrpc_server
+XMLRPC_CLIENT_LIBS = -L$(SRCDIR)/src/.libs -lxmlrpc_client
+XMLRPC_SERVER_ABYSS_LIBS = -L$(SRCDIR)/src/.libs -lxmlrpc_server_abyss
+XMLRPC_ABYSS_LIBS = -L$(SRCDIR)/lib/abyss/src -lxmlrpc_abyss
+XMLRPCPP_LIBS = -L. -lxmlrpc++
+XMLRPC_SERVERPP_LIBS = -L. -lxmlrpc_server++
+
# Rules for these are in Makefile.common, courtesy of TARGET_LIB_NAMES_PP:
$(LIBXMLRPC_CPP): XmlRpcCpp.osh
-$(LIBXMLRPC_CPP): LIBOBJECTS = XmlRpcCpp.osh
+$(LIBXMLRPC_CPP): LIBOBJECTS = XmlRpcCpp.osh $(XMLRPC_LIBS) $(XMLRPC_UTIL_LIBS) $(XMLRPC_SERVER_LIBS)
$(LIBXMLRPCPP): $(LIBXMLRPCPP_MODS:%=%.osh)
-$(LIBXMLRPCPP): LIBOBJECTS = $(LIBXMLRPCPP_MODS:%=%.osh)
+$(LIBXMLRPCPP): LIBOBJECTS = $(LIBXMLRPCPP_MODS:%=%.osh) $(XMLRPC_LIBS) $(XMLRPC_UTIL_LIBS)
$(LIBXMLRPC_SERVERPP): $(LIBXMLRPC_SERVERPP_MODS:%=%.osh )
-$(LIBXMLRPC_SERVERPP): LIBOBJECTS = $(LIBXMLRPC_SERVERPP_MODS:%=%.osh)
+$(LIBXMLRPC_SERVERPP): LIBOBJECTS = $(LIBXMLRPC_SERVERPP_MODS:%=%.osh) $(XMLRPC_LIBS) $(XMLRPCPP_LIBS) $(XMLRPC_UTIL_LIBS) $(XMLRPC_SERVER_LIBS)
$(LIBXMLRPC_SERVER_ABYSSPP): $(LIBXMLRPC_SERVER_ABYSSPP_MODS:%=%.osh)
-$(LIBXMLRPC_SERVER_ABYSSPP): LIBOBJECTS = $(LIBXMLRPC_SERVER_ABYSSPP_MODS:%=%.osh)
+$(LIBXMLRPC_SERVER_ABYSSPP): LIBOBJECTS = $(LIBXMLRPC_SERVER_ABYSSPP_MODS:%=%.osh) $(XMLRPCPP_LIBS) $(XMLRPC_ABYSS_LIBS) $(XMLRPC_SERVER_ABYSS_LIBS) $(XMLRPC_SERVERPP_LIBS)
$(LIBXMLRPC_SERVER_PSTREAMPP): $(LIBXMLRPC_SERVER_PSTREAMPP_MODS:%=%.osh)
$(LIBXMLRPC_SERVER_PSTREAMPP): LIBOBJECTS = $(LIBXMLRPC_SERVER_PSTREAMPP_MODS:%=%.osh)
$(LIBXMLRPC_CLIENTPP): $(LIBXMLRPC_CLIENTPP_MODS:%=%.osh)
-$(LIBXMLRPC_CLIENTPP): LIBOBJECTS = $(LIBXMLRPC_CLIENTPP_MODS:%=%.osh)
+$(LIBXMLRPC_CLIENTPP): LIBOBJECTS = $(LIBXMLRPC_CLIENTPP_MODS:%=%.osh) $(XMLRPC_LIBS) $(XMLRPCPP_LIBS) $(XMLRPC_CLIENT_LIBS)
$(LIBXMLRPC_PACKETSOCKET): $(LIBXMLRPC_PACKETSOCKET_MODS:%=%.osh)
$(LIBXMLRPC_PACKETSOCKET): LIBOBJECTS = $(LIBXMLRPC_PACKETSOCKET_MODS:%=%.osh)
@@ -189,7 +198,7 @@ $(LIBXMLRPC_PACKETSOCKET_MODS:%=%.o) \
$(LIBXMLRPC_PACKETSOCKET_MODS:%=%.osh): \
INCLUDES = $(BASIC_INCLUDES)
-CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD)
+CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CFLAGS_SHLIB) $(CADD)
TRANSPORT_CONFIG_USERS = client curl libwww wininet
--- xmlrpc-c/xmlrpc-c-config.test.main.orig 2007-05-31 08:43:04 +0600
+++ xmlrpc-c/xmlrpc-c-config.test.main 2007-10-22 01:34:31 +0600
@@ -30,8 +30,8 @@ fi
needCpp=no
-LIBXMLRPC="${BLDDIR}/src/.libs/libxmlrpc.a"
-LIBXMLRPC_UTIL="${BLDDIR}/lib/libutil/libxmlrpc_util.a"
+LIBXMLRPC="${BLDDIR}/src/.libs/libxmlrpc.so"
+LIBXMLRPC_UTIL="${BLDDIR}/lib/libutil/libxmlrpc_util.so"
the_libs="${LIBXMLRPC} ${LIBXMLRPC_UTIL} ${LIBXML} $the_libs"
the_includes="-I${BLDDIR}/include -I${ABS_SRCDIR}/include $the_includes"
@@ -45,49 +45,49 @@ while test $# -gt 0; do
# and server. So all legacy C++ programs get linked with client
# and server libraries, whether they need them or not.
- the_libs="${BLDDIR}/src/.libs/libxmlrpc_server.a $the_libs"
- the_libs="${BLDDIR}/src/.libs/libxmlrpc_server_abyss.a $the_libs"
- the_libs="${BLDDIR}/src/.libs/libxmlrpc_client.a $the_libs"
- the_libs="${BLDDIR}/src/cpp/libxmlrpc_cpp.a $the_libs"
+ the_libs="${BLDDIR}/src/.libs/libxmlrpc_server.so $the_libs"
+ the_libs="${BLDDIR}/src/.libs/libxmlrpc_server_abyss.so $the_libs"
+ the_libs="${BLDDIR}/src/.libs/libxmlrpc_client.so $the_libs"
+ the_libs="${BLDDIR}/src/cpp/libxmlrpc_cpp.so $the_libs"
;;
c++2)
needCpp=yes
- the_libs="${BLDDIR}/src/cpp/libxmlrpc++.a $the_libs"
+ the_libs="${BLDDIR}/src/cpp/libxmlrpc++.so $the_libs"
;;
pstream-client)
- packetsocket_lib="${BLDDIR}/src/cpp/libxmlrpc_packetsocket.a"
+ packetsocket_lib="${BLDDIR}/src/cpp/libxmlrpc_packetsocket.so"
;;
server-util)
- the_libs="${BLDDIR}/src/.libs/libxmlrpc_server.a $the_libs"
+ the_libs="${BLDDIR}/src/.libs/libxmlrpc_server.so $the_libs"
;;
cgi-server)
- the_libs="${BLDDIR}/src/.libs/libxmlrpc_server.a $the_libs"
- the_libs="${BLDDIR}/src/.libs/libxmlrpc_server_cgi.a $the_libs"
+ the_libs="${BLDDIR}/src/.libs/libxmlrpc_server.so $the_libs"
+ the_libs="${BLDDIR}/src/.libs/libxmlrpc_server_cgi.so $the_libs"
;;
abyss-server)
if test "${ENABLE_ABYSS_THREADS}" = "yes"; then
the_libs="-lpthread $the_libs"
fi
the_libs="${LSOCKET} $the_libs"
- the_libs="${BLDDIR}/lib/abyss/src/libxmlrpc_abyss.a $the_libs"
- the_libs="${BLDDIR}/src/.libs/libxmlrpc_server.a $the_libs"
- the_libs="${BLDDIR}/src/.libs/libxmlrpc_server_abyss.a $the_libs"
+ the_libs="${BLDDIR}/lib/abyss/src/libxmlrpc_abyss.so $the_libs"
+ the_libs="${BLDDIR}/src/.libs/libxmlrpc_server.so $the_libs"
+ the_libs="${BLDDIR}/src/.libs/libxmlrpc_server_abyss.so $the_libs"
if test "${needCpp}" = "yes"; then
- the_libs="${BLDDIR}/src/cpp/libxmlrpc_server++.a $the_libs"
- the_libs="${BLDDIR}/src/cpp/libxmlrpc_server_abyss++.a $the_libs"
+ the_libs="${BLDDIR}/src/cpp/libxmlrpc_server++.so $the_libs"
+ the_libs="${BLDDIR}/src/cpp/libxmlrpc_server_abyss++.so $the_libs"
fi
sopath="${BLDDIR}/lib/abyss/src:$sopath"
;;
pstream-server)
the_libs="${LSOCKET} $the_libs"
- the_libs="${BLDDIR}/src/cpp/libxmlrpc_server_pstream++.a $the_libs"
- the_libs="${BLDDIR}/src/.libs/libxmlrpc_server.a $the_libs"
- the_libs="${BLDDIR}/src/cpp/libxmlrpc_server++.a $the_libs"
- the_libs="${BLDDIR}/src/cpp/libxmlrpc_server_pstream++.a $the_libs"
- packetsocket_lib="${BLDDIR}/src/cpp/libxmlrpc_packetsocket.a"
+ the_libs="${BLDDIR}/src/cpp/libxmlrpc_server_pstream++.so $the_libs"
+ the_libs="${BLDDIR}/src/.libs/libxmlrpc_server.so $the_libs"
+ the_libs="${BLDDIR}/src/cpp/libxmlrpc_server++.so $the_libs"
+ the_libs="${BLDDIR}/src/cpp/libxmlrpc_server_pstream++.so $the_libs"
+ packetsocket_lib="${BLDDIR}/src/cpp/libxmlrpc_packetsocket.so"
;;
client)
- the_libs="${BLDDIR}/src/.libs/libxmlrpc_client.a $the_libs"
+ the_libs="${BLDDIR}/src/.libs/libxmlrpc_client.so $the_libs"
if test "${MUST_BUILD_WININET_CLIENT}" = "yes"; then
the_libs="$WININET_LDADD $the_libs"
the_rpath="$WININET_RPATH $the_rpath"
@@ -104,7 +104,7 @@ while test $# -gt 0; do
the_wl_rpath="$LIBWWW_WL_RPATH $the_wl_rpath"
fi
if test "${needCpp}" = "yes"; then
- the_libs="${BLDDIR}/src/cpp/libxmlrpc_client++.a $the_libs"
+ the_libs="${BLDDIR}/src/cpp/libxmlrpc_client++.so $the_libs"
fi
;;
--version)