diff options
Diffstat (limited to 'dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.08-build-tools-restructure.patch')
| -rw-r--r-- | dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.08-build-tools-restructure.patch | 441 |
1 files changed, 441 insertions, 0 deletions
diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.08-build-tools-restructure.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.08-build-tools-restructure.patch new file mode 100644 index 0000000..80611e6 --- /dev/null +++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.08-build-tools-restructure.patch @@ -0,0 +1,441 @@ +diff -NrU5 xmlrpc-c-1.16.08.orig/common.mk xmlrpc-c-1.16.08/common.mk +--- xmlrpc-c-1.16.08.orig/common.mk 2009-01-21 23:08:11.000000000 +0100 ++++ xmlrpc-c-1.16.08/common.mk 2009-01-22 12:23:17.000000000 +0100 +@@ -485,14 +485,14 @@ + # (except shared libraries) # + ############################################################################## + + MKINSTALLDIRS = $(SHELL) $(SRCDIR)/mkinstalldirs + +-.PHONY: install-common install-headers install-bin ++.PHONY: install-common install-headers install-bin install-man + install-common: \ + install-static-libraries install-shared-libraries \ +- install-headers install-bin ++ install-headers install-bin install-man + + INSTALL_LIB_CMD = $(INSTALL_DATA) $$p $(DESTDIR)$(LIBINST_DIR)/$$p + RANLIB_CMD = $(RANLIB) $(DESTDIR)$(LIBINST_DIR)/$$p + + install-static-libraries: $(STATIC_LIBRARIES_TO_INSTALL) +@@ -534,10 +534,20 @@ + done + + $(DESTDIR)$(PROGRAMINST_DIR): + $(MKINSTALLDIRS) $@ + ++MANDESTDIR = $(DESTDIR)$(MANINST_DIR) ++INSTALL_MAN_CMD = $(INSTALL_DATA) $$p $(MANDESTDIR)/$$p ++ ++install-man: $(MAN_FILES_TO_INSTALL) ++ $(MKINSTALLDIRS) $(MANDESTDIR) ++ @list='$(MAN_FILES_TO_INSTALL)'; \ ++ for p in $$list; do \ ++ echo "$(MAN_FILES_TO_INSTALL)"; \ ++ $(INSTALL_MAN_CMD); \ ++ done + + ############################################################################## + # MISCELLANEOUS RULES # + ############################################################################## + +diff -NrU5 xmlrpc-c-1.16.08.orig/config.mk.in xmlrpc-c-1.16.08/config.mk.in +--- xmlrpc-c-1.16.08.orig/config.mk.in 2009-01-22 12:05:43.000000000 +0100 ++++ xmlrpc-c-1.16.08/config.mk.in 2009-01-22 12:05:27.000000000 +0100 +@@ -25,10 +25,12 @@ + ENABLE_LIBXML2_BACKEND = @ENABLE_LIBXML2_BACKEND@ + + MUST_BUILD_WININET_CLIENT = @MUST_BUILD_WININET_CLIENT@ + MUST_BUILD_CURL_CLIENT = @MUST_BUILD_CURL_CLIENT@ + MUST_BUILD_LIBWWW_CLIENT = @MUST_BUILD_LIBWWW_CLIENT@ ++BUILD_TOOLS = @BUILD_TOOLS@ ++BUILD_XMLRPC_PSTREAM = @BUILD_XMLRPC_PSTREAM@ + LSOCKET = @LSOCKET@ + WININET_LDADD = @WININET_LDADD@ + WININET_RPATH = @WININET_RPATH@ + WININET_WL_RPATH = @WININET_WL_RPATH@ + CURL_LDADD = @CURL_LDADD@ +@@ -318,10 +320,11 @@ + # he doesn't like the default specified at 'configure' time. + + LIBINST_DIR = $(PREFIX)/lib + HEADERINST_DIR = $(PREFIX)/include + PROGRAMINST_DIR = $(PREFIX)/bin ++MANINST_DIR = $(PREFIX)/share/man/man1 + + # DESTDIR is designed to be overridden at make time in order to relocate + # the entire install into a subdirectory. + DESTDIR = + +diff -NrU5 xmlrpc-c-1.16.08.orig/configure.in xmlrpc-c-1.16.08/configure.in +--- xmlrpc-c-1.16.08.orig/configure.in 2009-01-21 23:08:11.000000000 +0100 ++++ xmlrpc-c-1.16.08/configure.in 2009-01-22 01:30:32.000000000 +0100 +@@ -84,10 +84,39 @@ + AC_MSG_CHECKING(whether to build Libwww client XML transport module) + AC_MSG_RESULT($MUST_BUILD_LIBWWW_CLIENT) + AC_SUBST(MUST_BUILD_LIBWWW_CLIENT) + + ++AC_ARG_ENABLE(tools, ++ [ --enable-tools Build the xmlrpc tools], , ++[enable_tools=no]) ++ ++BUILD_XMLRPC_PSTREAM=no ++ ++if test $enable_tools = yes; then ++ if ! test "$MUST_BUILD_WININET_CLIENT $MUST_BUILD_CURL_CLIENT $MUST_BUILD_LIBWWW_CLIENT" = "no no no"; then ++ AC_CHECK_LIB(ncurses, main, [have_libncurses=yes], [have_libncurses=no]) ++ AC_CHECK_LIB(readline, main, [have_libreadline=yes], [have_libreadline=no]) ++ if test $have_libreadline = yes && test $have_libncurses = yes; then ++ BUILD_XMLRPC_PSTREAM=yes ++ fi ++ BUILD_TOOLS=yes ++ fi ++else ++ BUILD_TOOLS=$enable_tools ++fi ++ ++AC_MSG_CHECKING(whether to build xmlrpc tools) ++AC_MSG_RESULT($BUILD_TOOLS) ++AC_SUBST(BUILD_TOOLS) ++if test $BUILD_TOOLS = yes; then ++ AC_MSG_CHECKING(whether to build the xmlrpc_pstream tool) ++ AC_MSG_RESULT($BUILD_XMLRPC_PSTREAM) ++ AC_SUBST(BUILD_XMLRPC_PSTREAM) ++fi ++ ++ + dnl Set up the appropriate Makefile substitutions. + + LIBXMLRPC_CLIENT_LA=libxmlrpc_client.la + AC_SUBST(LIBXMLRPC_CLIENT_LA) + CLIENTTEST=clienttest +diff -NrU5 xmlrpc-c-1.16.08.orig/GNUmakefile xmlrpc-c-1.16.08/GNUmakefile +--- xmlrpc-c-1.16.08.orig/GNUmakefile 2009-01-21 23:08:28.000000000 +0100 ++++ xmlrpc-c-1.16.08/GNUmakefile 2009-01-22 01:29:12.000000000 +0100 +@@ -21,10 +21,14 @@ + # As with any subdirectory, to build 'tools' or 'examples', cd to the + # subdirectory and make there. + + DEFAULT_SUBDIRS = include lib src + ++ifeq ($(BUILD_TOOLS),yes) ++ DEFAULT_SUBDIRS += tools ++endif ++ + PROGRAMS_TO_INSTALL = xmlrpc-c-config + + default: xmlrpc-c-config xmlrpc-c-config.test $(DEFAULT_SUBDIRS:%=%/all) + + # We don't want common.mk's rule for version.h +diff -NrU5 xmlrpc-c-1.16.08.orig/tools/Makefile xmlrpc-c-1.16.08/tools/Makefile +--- xmlrpc-c-1.16.08.orig/tools/Makefile 2009-01-21 23:08:28.000000000 +0100 ++++ xmlrpc-c-1.16.08/tools/Makefile 2009-01-22 12:39:18.000000000 +0100 +@@ -5,21 +5,16 @@ + endif + SUBDIR := tools + + include $(BLDDIR)/config.mk + +-SUBDIRS = lib binmode-rpc-kit turbocharger ++#PROGRAMS_TO_INSTALL := ++#MAN_FILES_TO_INSTALL := ++#PROGRAMS_TO_INSTALL += xml-rpc-api2txt ++#MAN_FILES_TO_INSTALL += xml-rpc-api2txt.1 + +-ifeq ($(MUST_BUILD_CLIENT),yes) +- SUBDIRS += xmlrpc xmlrpc_transport +- +- ifeq ($(ENABLE_CPLUSPLUS),yes) +- SUBDIRS += xml-rpc-api2cpp xmlrpc_cpp_proxy +- # We could add 'xmlrpc_pstream' here, but we don't because we don't +- # want to deal with finding the Readline/Ncurses libraries. +- endif +-endif ++SUBDIRS = lib binmode-rpc-kit turbocharger xmlrpc xmlrpc_transport xml-rpc-api2cpp xmlrpc_cpp_proxy xmlrpc_pstream + + .PHONY: all clean distclean install check dep + + all: $(SUBDIRS:%=%/all) + +diff -NrU5 xmlrpc-c-1.16.08.orig/tools/xmlrpc/Makefile xmlrpc-c-1.16.08/tools/xmlrpc/Makefile +--- xmlrpc-c-1.16.08.orig/tools/xmlrpc/Makefile 2009-01-21 23:08:11.000000000 +0100 ++++ xmlrpc-c-1.16.08/tools/xmlrpc/Makefile 2009-01-22 00:04:43.000000000 +0100 +@@ -4,18 +4,24 @@ + SRCDIR := $(call updir,$(TOOLSDIR)) + BLDDIR := $(SRCDIR) + endif + SUBDIR := tools/xmlrpc + +-default: all +- + include $(BLDDIR)/config.mk + +-PROGRAMS_TO_INSTALL = xmlrpc +- + include $(SRCDIR)/tools/common.mk + ++PROGRAMS_TO_INSTALL := ++ ++ifeq ($(MUST_BUILD_CLIENT),yes) ++ PROGRAMS_TO_INSTALL += xmlrpc ++endif ++ ++all: $(PROGRAMS_TO_INSTALL) ++ ++default: all ++ + INCLUDES = \ + -I../lib/include \ + -Iblddir \ + -Iblddir/include \ + -Isrcdir/include \ +@@ -23,12 +29,10 @@ + + CFLAGS = $(CFLAGS_COMMON) $(INCLUDES) $(CFLAGS_PERSONAL) $(CADD) + + LDFLAGS = $(LADD) + +-all: xmlrpc +- + UTIL_OBJS = \ + casprintf.o \ + cmdline_parser.o \ + getoptx.o \ + stripcaseeq.o \ +diff -NrU5 xmlrpc-c-1.16.08.orig/tools/xml-rpc-api2cpp/Makefile xmlrpc-c-1.16.08/tools/xml-rpc-api2cpp/Makefile +--- xmlrpc-c-1.16.08.orig/tools/xml-rpc-api2cpp/Makefile 2009-01-21 23:08:20.000000000 +0100 ++++ xmlrpc-c-1.16.08/tools/xml-rpc-api2cpp/Makefile 2009-01-22 12:24:17.000000000 +0100 +@@ -4,32 +4,36 @@ + SRCDIR := $(call updir,$(TOOLSDIR)) + BLDDIR := $(SRCDIR) + endif + SUBDIR := tools/xml-rpc-api2cpp + +-default: all +- + include $(BLDDIR)/config.mk + ++PROGRAMS_TO_INSTALL := ++MAN_FILES_TO_INSTALL := ++ ++ifeq ($(MUST_BUILD_CLIENT),yes) ++ ifeq ($(ENABLE_CPLUSPLUS),yes) ++ PROGRAMS_TO_INSTALL += xml-rpc-api2cpp ++ MAN_FILES_TO_INSTALL += xml-rpc-api2cpp.1 ++ endif ++endif ++ ++all: $(PROGRAMS_TO_INSTALL) ++ ++default: all ++ + include $(SRCDIR)/tools/common.mk + + INCLUDES = -I$(BLDDIR) -I$(BLDDIR)/include -I$(SRCDIR)/include + + CXXFLAGS = $(INCLUDES) $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD) + + LDFLAGS = $(LADD) + + LDLIBS = -L$(BLDDIR)/src/cpp -lxmlrpc_cpp -lxmlrpc_server $(CLIENT_LDLIBS) + +-PROGS := +- +-ifeq ($(MUST_BUILD_CLIENT),yes) +- PROGS += xml-rpc-api2cpp +-endif +- +-all: $(PROGS) +- + OBJECTS = \ + xml-rpc-api2cpp.o \ + DataType.o \ + XmlRpcFunction.o \ + XmlRpcClass.o \ +File xmlrpc-c-1.16.08.orig/tools/xml-rpc-api2txt is a regular file while file xmlrpc-c-1.16.08/tools/xml-rpc-api2txt is a directory +diff -NrU5 xmlrpc-c-1.16.08.orig/tools/xml-rpc-api2txt.1 xmlrpc-c-1.16.08/tools/xml-rpc-api2txt.1 +--- xmlrpc-c-1.16.08.orig/tools/xml-rpc-api2txt.1 2009-01-21 23:08:11.000000000 +0100 ++++ xmlrpc-c-1.16.08/tools/xml-rpc-api2txt.1 1970-01-01 01:00:00.000000000 +0100 +@@ -1,47 +0,0 @@ +-.\" Hey, EMACS: -*- nroff -*- +-.\" First parameter, NAME, should be all caps +-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +-.\" other parameters are allowed: see man(7), man(1) +-.TH XML-RPC-API2TXT 1 "June 27, 2001" +-.\" Please adjust this date whenever revising the manpage. +-.\" +-.\" Some roff macros, for reference: +-.\" .nh disable hyphenation +-.\" .hy enable hyphenation +-.\" .ad l left justify +-.\" .ad b justify to both left and right margins +-.\" .nf disable filling +-.\" .fi enable filling +-.\" .br insert line break +-.\" .sp <n> insert n+1 empty lines +-.\" for manpage-specific macros, see man(7) +-.SH NAME +-xml-rpc-api2txt \- Print out a description of an XML-RPC API as text +-.SH SYNOPSIS +-.B xml-rpc-api2txt +-\fIserver-url\fR +-.SH DESCRIPTION +-xml-rpc-api2txt queries an XML-RPC server using the XML-RPC +-Instrospection API designed by Edd Dumbill. It then prints the +-results to standard output in a nicely formatted form, suitable for +-sending via e-mail. +-.PP +-You can find a list of supported XML-RPC server libraries (and patches +-for many others) at \fBhttp://xmlrpc-c.sourceforge.net/hacks.php\fR. +-.SH OPTIONS +-.TP +-.I server-url +-The name of the server to query. Try +-\fBhttp://xmlrpc-c.sourceforge.net/cgi-bin/interop.cgi\fR. +-.SH BUGS +-xml-rpc-api2txt assumes that method descriptions are ASCII text, not +-HTML as specified in the standard. (In practice, both conventions are +-often seen.) +-.SH SEE ALSO +-.BR xmlrpc-c (7), +-.BR xml-rpc-api2cpp (1). +-.PP +-This program is part of xmlrpc-c. +-.SH AUTHOR +-This manual page was written by Eric Kidd <eric.kidd@pobox.com>. +-It may be distributed under the same terms as the rest of xmlrpc-c. +diff -NrU5 xmlrpc-c-1.16.08.orig/tools/xmlrpc_cpp_proxy/Makefile xmlrpc-c-1.16.08/tools/xmlrpc_cpp_proxy/Makefile +--- xmlrpc-c-1.16.08.orig/tools/xmlrpc_cpp_proxy/Makefile 2009-01-21 23:08:11.000000000 +0100 ++++ xmlrpc-c-1.16.08/tools/xmlrpc_cpp_proxy/Makefile 2009-01-22 00:07:51.000000000 +0100 +@@ -4,26 +4,32 @@ + SRCDIR := $(call updir,$(TOOLSDIR)) + BLDDIR := $(SRCDIR) + endif + SUBDIR := tools/xmlrpc_cpp_proxy + +-default: all +- + include $(BLDDIR)/config.mk + +-PROGRAMS_TO_INSTALL = xmlrpc_cpp_proxy ++PROGRAMS_TO_INSTALL := ++ ++ifeq ($(MUST_BUILD_CLIENT),yes) ++ ifeq ($(ENABLE_CPLUSPLUS),yes) ++ PROGRAMS_TO_INSTALL += xmlrpc_cpp_proxy ++ endif ++endif ++ ++all: $(PROGRAMS_TO_INSTALL) ++ ++default: all + + include $(SRCDIR)/tools/common.mk + + INCLUDES = -I$(BLDDIR) -I$(BLDDIR)/include -I$(SRCDIR)/include + + CXXFLAGS = $(INCLUDES) $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD) + + LDFLAGS = $(LADD) + +-all: xmlrpc_cpp_proxy +- + OBJECTS = \ + xmlrpc_cpp_proxy.o \ + xmlrpcMethod.o \ + xmlrpcType.o \ + proxyClass.o \ +diff -NrU5 xmlrpc-c-1.16.08.orig/tools/xmlrpc_pstream/Makefile xmlrpc-c-1.16.08/tools/xmlrpc_pstream/Makefile +--- xmlrpc-c-1.16.08.orig/tools/xmlrpc_pstream/Makefile 2009-01-21 23:08:20.000000000 +0100 ++++ xmlrpc-c-1.16.08/tools/xmlrpc_pstream/Makefile 2009-01-22 01:33:14.000000000 +0100 +@@ -4,17 +4,27 @@ + SRCDIR := $(call updir,$(TOOLSDIR)) + BLDDIR := $(SRCDIR) + endif + SUBDIR := tools/xmlrpc_pstream + +-READLINE_LDLIBS = -lreadline -lncurses ++include $(BLDDIR)/config.mk + +-default: all ++PROGRAMS_TO_INSTALL := + +-include $(BLDDIR)/config.mk ++ifeq ($(BUILD_XMLRPC_PSTREAM),yes) ++ ifeq ($(MUST_BUILD_CLIENT),yes) ++ ifeq ($(ENABLE_CPLUSPLUS),yes) ++ PROGRAMS_TO_INSTALL += xmlrpc_pstream ++ endif ++ endif ++endif + +-PROGRAMS_TO_INSTALL = xmlrpc_pstream ++all: $(PROGRAMS_TO_INSTALL) ++ ++default: all ++ ++READLINE_LDLIBS = -lreadline -lncurses + + include $(SRCDIR)/tools/common.mk + + INCLUDES = \ + -I../lib/include \ +@@ -25,15 +35,13 @@ + + CXXFLAGS = $(INCLUDES) $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD) + + LDFLAGS = $(LADD) + +-all: xmlrpc_pstream +- + OBJECTS = \ + xmlrpc_pstream.o \ +- $(TOOLSDIR)/lib/dumpvalue.o \ ++ srcdir/tools/lib/dumpvalue.o \ + + LIBS = \ + $(LIBXMLRPC_CLIENTPP) \ + $(LIBXMLRPCPP) \ + $(LIBXMLRPC_CLIENT) \ +diff -NrU5 xmlrpc-c-1.16.08.orig/tools/xmlrpc_transport/Makefile xmlrpc-c-1.16.08/tools/xmlrpc_transport/Makefile +--- xmlrpc-c-1.16.08.orig/tools/xmlrpc_transport/Makefile 2009-01-21 23:08:11.000000000 +0100 ++++ xmlrpc-c-1.16.08/tools/xmlrpc_transport/Makefile 2009-01-22 00:07:48.000000000 +0100 +@@ -4,15 +4,21 @@ + SRCDIR := $(call updir,$(TOOLSDIR)) + BLDDIR := $(SRCDIR) + endif + SUBDIR := tools/xmlrpc_transport + +-default: all +- + include $(BLDDIR)/config.mk + +-PROGRAMS_TO_INSTALL = xmlrpc_transport ++PROGRAMS_TO_INSTALL := ++ ++ifeq ($(MUST_BUILD_CLIENT),yes) ++ PROGRAMS_TO_INSTALL += xmlrpc_transport ++endif ++ ++all: $(PROGRAMS_TO_INSTALL) ++ ++default: all + + include $(SRCDIR)/tools/common.mk + + INCLUDES = \ + -I$(BLDDIR) \ +@@ -22,12 +28,10 @@ + + CFLAGS = $(CFLAGS_COMMON) $(INCLUDES) $(CFLAGS_PERSONAL) $(CADD) + + LDFLAGS = $(LADD) + +-all: xmlrpc_transport +- + UTIL_OBJS = \ + casprintf.o \ + cmdline_parser.o \ + getoptx.o \ + stripcaseeq.o \ |