d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xmlrpc-c: fix subdir - causes git-init failure

This commit is contained in:
Tony Theodore 2017-11-18 23:44:20 +11:00
parent 6bc95c1db6
commit 99b8d33061
2 changed files with 52 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/xmlrpc-c-1-fixes.patch
View File

@ -1,9 +1,17 @@
This file is part of MXE. See LICENSE.md for licensing information. This file is part of MXE. See LICENSE.md for licensing information.
Index: stable/lib/curl_transport/curltransaction.c Contains ad hoc patches for cross building.
===================================================================
--- stable/lib/curl_transport/curltransaction.c (revision 2571) From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+++ stable/lib/curl_transport/curltransaction.c (working copy) From: Tony Theodore <tonyt@logyst.com>
Date: Sat, 18 Nov 2017 23:32:38 +1100
Subject: [PATCH] fixes
diff --git a/advanced/lib/curl_transport/curltransaction.c b/advanced/lib/curl_transport/curltransaction.c
index 1111111..2222222 100644
--- a/advanced/lib/curl_transport/curltransaction.c
+++ b/advanced/lib/curl_transport/curltransaction.c
@@ -2,8 +2,6 @@ @@ -2,8 +2,6 @@
curlTransaction curlTransaction
=============================================================================*/ =============================================================================*/
@ -13,14 +21,15 @@ Index: stable/lib/curl_transport/curltransaction.c
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
Index: stable/lib/expat/xmlparse/xmlparse.c diff --git a/advanced/lib/expat/xmlparse/xmlparse.c b/advanced/lib/expat/xmlparse/xmlparse.c
=================================================================== index 1111111..2222222 100644
--- stable/lib/expat/xmlparse/xmlparse.c (revision 2571) --- a/advanced/lib/expat/xmlparse/xmlparse.c
+++ stable/lib/expat/xmlparse/xmlparse.c (working copy) +++ b/advanced/lib/expat/xmlparse/xmlparse.c
@@ -4547,14 +4547,6 @@ @@ -4546,14 +4546,6 @@ parseNoBuffer(Parser * const parser,
}
int -int
-XML_SetHashSalt(XML_Parser parser, -XML_SetHashSalt(XML_Parser parser,
- unsigned long hash_salt) - unsigned long hash_salt)
-{ -{
@ -28,15 +37,14 @@ Index: stable/lib/expat/xmlparse/xmlparse.c
- return 1; - return 1;
-} -}
- -
-int int
xmlrpc_XML_Parse(XML_Parser const xmlParserP, xmlrpc_XML_Parse(XML_Parser const xmlParserP,
const char * const s, const char * const s,
size_t const len, diff --git a/advanced/lib/expat/xmlparse/xmlparse.h b/advanced/lib/expat/xmlparse/xmlparse.h
Index: stable/lib/expat/xmlparse/xmlparse.h index 1111111..2222222 100644
=================================================================== --- a/advanced/lib/expat/xmlparse/xmlparse.h
--- stable/lib/expat/xmlparse/xmlparse.h (revision 2571) +++ b/advanced/lib/expat/xmlparse/xmlparse.h
+++ stable/lib/expat/xmlparse/xmlparse.h (working copy) @@ -491,8 +491,6 @@ xmlrpc_XML_SetParamEntityParsing(XML_Parser parser,
@@ -491,8 +491,6 @@
function behavior. This must be called before parsing is started. function behavior. This must be called before parsing is started.
Returns 1 if successful, 0 when called after parsing has started. Returns 1 if successful, 0 when called after parsing has started.
*/ */
@ -45,10 +53,10 @@ Index: stable/lib/expat/xmlparse/xmlparse.h
enum XML_Error { enum XML_Error {
XML_ERROR_NONE, XML_ERROR_NONE,
Index: stable/src/cpp/packetsocket.cpp diff --git a/advanced/src/cpp/packetsocket.cpp b/advanced/src/cpp/packetsocket.cpp
=================================================================== index 1111111..2222222 100644
--- stable/src/cpp/packetsocket.cpp (revision 2571) --- a/advanced/src/cpp/packetsocket.cpp
+++ stable/src/cpp/packetsocket.cpp (working copy) +++ b/advanced/src/cpp/packetsocket.cpp
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
example, an unplugged TCP/IP network cable. It's probably better example, an unplugged TCP/IP network cable. It's probably better
to use the TCP keepalive facility for that. to use the TCP keepalive facility for that.
@ -58,20 +66,20 @@ Index: stable/src/cpp/packetsocket.cpp
#include <cassert> #include <cassert>
#include <string> #include <string>
Index: stable/src/cpp/server_abyss.cpp diff --git a/advanced/src/cpp/server_abyss.cpp b/advanced/src/cpp/server_abyss.cpp
=================================================================== index 1111111..2222222 100644
--- stable/src/cpp/server_abyss.cpp (revision 2571) --- a/advanced/src/cpp/server_abyss.cpp
+++ stable/src/cpp/server_abyss.cpp (working copy) +++ b/advanced/src/cpp/server_abyss.cpp
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#include "xmlrpc_config.h" -#include "xmlrpc_config.h"
+#define MSVCRT 1 +#define MSVCRT 1
#define WIN32_LEAN_AND_MEAN /* required by xmlrpc-c/abyss.h */ #define WIN32_LEAN_AND_MEAN /* required by xmlrpc-c/abyss.h */
#include <cstdlib> #include <cstdlib>
#include <string> #include <string>
Index: stable/src/cpp/server_cgi.cpp diff --git a/advanced/src/cpp/server_cgi.cpp b/advanced/src/cpp/server_cgi.cpp
=================================================================== index 1111111..2222222 100644
--- stable/src/cpp/server_cgi.cpp (revision 2571) --- a/advanced/src/cpp/server_cgi.cpp
+++ stable/src/cpp/server_cgi.cpp (working copy) +++ b/advanced/src/cpp/server_cgi.cpp
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
Contributed to the public domain by its author. Contributed to the public domain by its author.
=============================================================================*/ =============================================================================*/
@ -81,10 +89,10 @@ Index: stable/src/cpp/server_cgi.cpp
#if MSVCRT #if MSVCRT
#ifndef _CRT_SECURE_NO_WARNINGS #ifndef _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
Index: stable/src/cpp/server_pstream.cpp diff --git a/advanced/src/cpp/server_pstream.cpp b/advanced/src/cpp/server_pstream.cpp
=================================================================== index 1111111..2222222 100644
--- stable/src/cpp/server_pstream.cpp (revision 2571) --- a/advanced/src/cpp/server_pstream.cpp
+++ stable/src/cpp/server_pstream.cpp (working copy) +++ b/advanced/src/cpp/server_pstream.cpp
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
Contributed to the public domain by its author. Contributed to the public domain by its author.
=============================================================================*/ =============================================================================*/
@ -94,10 +102,10 @@ Index: stable/src/cpp/server_pstream.cpp
#if MSVCRT #if MSVCRT
#ifndef _CRT_SECURE_NO_WARNINGS #ifndef _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
Index: stable/src/xmlrpc_datetime.c diff --git a/advanced/src/xmlrpc_datetime.c b/advanced/src/xmlrpc_datetime.c
=================================================================== index 1111111..2222222 100644
--- stable/src/xmlrpc_datetime.c (revision 2571) --- a/advanced/src/xmlrpc_datetime.c
+++ stable/src/xmlrpc_datetime.c (working copy) +++ b/advanced/src/xmlrpc_datetime.c
@@ -1,7 +1,5 @@ @@ -1,7 +1,5 @@
#include "xmlrpc_config.h" #include "xmlrpc_config.h"

14
src/xmlrpc-c.mk
View File

@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://xmlrpc-c.sourceforge.io/
$(PKG)_IGNORE := $(PKG)_IGNORE :=
$(PKG)_VERSION := d4364f4 $(PKG)_VERSION := d4364f4
$(PKG)_CHECKSUM := fbd79d86020a87ed61dfdf00f78873c0fd925f477a8705f415b9fee0d6d64b19 $(PKG)_CHECKSUM := fbd79d86020a87ed61dfdf00f78873c0fd925f477a8705f415b9fee0d6d64b19
$(PKG)_SUBDIR := mirror-$(PKG)-$($(PKG)_VERSION)/advanced $(PKG)_SUBDIR := mirror-$(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://github.com/mirror/$(PKG)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_URL := https://github.com/mirror/$(PKG)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc curl pthreads $(PKG)_DEPS := gcc curl pthreads
@ -26,9 +26,9 @@ $(PKG)_MAKE_OPTS = \
MUST_BUILD_SHLIB=@xmlrpc-c-must-build-shlib@ MUST_BUILD_SHLIB=@xmlrpc-c-must-build-shlib@
define $(PKG)_BUILD_COMMON define $(PKG)_BUILD_COMMON
$(SED) -i 's,curl-config,$(TARGET)-curl-config,g' '$(1)/lib/curl_transport/Makefile' $(SED) -i 's,curl-config,$(TARGET)-curl-config,g' '$(1)/advanced/lib/curl_transport/Makefile'
$(SED) -i 's,curl-config,$(TARGET)-curl-config,g' '$(1)/src/Makefile' $(SED) -i 's,curl-config,$(TARGET)-curl-config,g' '$(1)/advanced/src/Makefile'
cd '$(1)' && ./configure \ cd '$(1)/advanced' && ./configure \
--host='$(TARGET)' \ --host='$(TARGET)' \
--prefix='$(PREFIX)/$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \
--enable-abyss-server=no \ --enable-abyss-server=no \
@ -36,12 +36,12 @@ define $(PKG)_BUILD_COMMON
--enable-cplusplus \ --enable-cplusplus \
--enable-curl-client \ --enable-curl-client \
CURL_CONFIG='$(PREFIX)/$(TARGET)/bin/curl-config' CURL_CONFIG='$(PREFIX)/$(TARGET)/bin/curl-config'
$(MAKE) -C '$(1)' -j '$(JOBS)' $($(PKG)_MAKE_OPTS) $(MAKE) -C '$(1)/advanced' -j '$(JOBS)' $($(PKG)_MAKE_OPTS)
$(MAKE) -C '$(1)' -j 1 install $($(PKG)_MAKE_OPTS) $(MAKE) -C '$(1)/advanced' -j 1 install $($(PKG)_MAKE_OPTS)
'$(TARGET)-g++' \ '$(TARGET)-g++' \
-W -Wall -Werror -ansi -pedantic \ -W -Wall -Werror -ansi -pedantic \
'$(1)/examples/cpp/asynch_client.cpp' -o '$(PREFIX)/$(TARGET)/bin/test-xmlrpc-c.exe' \ '$(1)/advanced/examples/cpp/asynch_client.cpp' -o '$(PREFIX)/$(TARGET)/bin/test-xmlrpc-c.exe' \
`'$(PREFIX)/$(TARGET)/bin/xmlrpc-c-config' c++2 client --libs` \ `'$(PREFIX)/$(TARGET)/bin/xmlrpc-c-config' c++2 client --libs` \
`'$(TARGET)-pkg-config' libcurl --cflags --libs` `'$(TARGET)-pkg-config' libcurl --cflags --libs`
endef endef