Bump buildroot to version 2017-02
TG-3 #closed
This commit is contained in:
@@ -19,7 +19,7 @@ Index: b/lib/expat/gennmtab/Makefile
|
||||
+ $(CC_FOR_BUILD) -c $< -o $@ $(CFLAGS_FOR_BUILD) $(INCLUDES)
|
||||
|
||||
gennmtab:%:%.o
|
||||
- $(BUILDTOOL_CCLD) -o $@ $(LDFLAGS) $^
|
||||
- $(BUILDTOOL_CCLD) -o $@ $(LDFLAGS_ALL) $^
|
||||
+ $(CC_FOR_BUILD) -o $@ $(LDFLAGS_FOR_BUILD) $^
|
||||
|
||||
include depend.mk
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
Handle builds without C++
|
||||
|
||||
libxmlrpc nicely handles the fact of being built without C++ support,
|
||||
except for one location, fixed by this patch.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
|
||||
Index: b/lib/util/Makefile
|
||||
===================================================================
|
||||
--- a/lib/util/Makefile
|
||||
+++ b/lib/util/Makefile
|
||||
@@ -41,11 +41,14 @@
|
||||
LIBOBJS = \
|
||||
casprintf.o \
|
||||
cmdline_parser.o \
|
||||
- cmdline_parser_cpp.o \
|
||||
getoptx.o \
|
||||
string_parser.o \
|
||||
stripcaseeq.o \
|
||||
|
||||
+ifeq ($(ENABLE_CPLUSPLUS),yes)
|
||||
+LIBOBJS += cmdline_parser_cpp.o
|
||||
+endif
|
||||
+
|
||||
.PHONY: all
|
||||
all: $(LIBOBJS)
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
Fix detection of AR and RANLIB
|
||||
|
||||
The configure.in script assumes that ranlib and ar are necessarily
|
||||
prefixed by ${ac_tool_prefix}, which is the value of --host. However,
|
||||
it's not necessarily the case.
|
||||
|
||||
So instead, use AC_CHECK_TOOL to check for AR, and AC_PROG_RANLIB to
|
||||
check for RANLIB.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
|
||||
Index: b/configure.in
|
||||
===================================================================
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -621,10 +621,8 @@
|
||||
BUILDDIR=$(pwd)
|
||||
AC_SUBST(BUILDDIR)
|
||||
|
||||
-AR=${ac_tool_prefix}ar
|
||||
-AC_SUBST([AR])
|
||||
-RANLIB=${ac_tool_prefix}ranlib
|
||||
-AC_SUBST([RANLIB])
|
||||
+AC_CHECK_TOOL([AR], [ar])
|
||||
+AC_PROG_RANLIB
|
||||
|
||||
dnl =======================================================================
|
||||
dnl Output our results.
|
||||
@@ -1,24 +0,0 @@
|
||||
Disable wide-char specific code
|
||||
|
||||
The vast majority of the libxmlrpc code nicely handles the absence of
|
||||
wide char support, except at one location, which is fixed by this
|
||||
patch.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
|
||||
Index: b/src/xmlrpc_decompose.c
|
||||
===================================================================
|
||||
--- a/src/xmlrpc_decompose.c
|
||||
+++ b/src/xmlrpc_decompose.c
|
||||
@@ -217,7 +217,11 @@
|
||||
xmlrpc_strfree(*decompRootP->store.Tstring.valueP);
|
||||
break;
|
||||
case 'w':
|
||||
+#if HAVE_UNICODE_WCHAR
|
||||
free((void*)*decompRootP->store.TwideString.valueP);
|
||||
+#else
|
||||
+ XMLRPC_ASSERT(false);
|
||||
+#endif
|
||||
break;
|
||||
case '6':
|
||||
free((void*)*decompRootP->store.TbitString.valueP);
|
||||
@@ -12,15 +12,15 @@ Index: b/src/Makefile
|
||||
===================================================================
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -56,7 +56,7 @@
|
||||
TRANSPORT_MODS += blddir/lib/curl_transport/curltransaction
|
||||
TRANSPORT_MODS += blddir/lib/curl_transport/curlmulti
|
||||
TRANSPORT_MODS += blddir/lib/curl_transport/lock_pthread
|
||||
@@ -57,7 +57,7 @@
|
||||
TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/xmlrpc_curl_transport
|
||||
TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/curltransaction
|
||||
TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/curlmulti
|
||||
- TRANSPORT_LIBDEP += $(shell curl-config --libs)
|
||||
+ TRANSPORT_LIBDEP += $(shell $CURL_CONFIG --libs)
|
||||
TRANSPORT_INCLUDES += -Isrcdir/lib/curl_transport
|
||||
endif
|
||||
ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
|
||||
TRANSPORT_MODS += blddir/lib/libwww_transport/xmlrpc_libwww_transport
|
||||
Index: b/config.mk.in
|
||||
===================================================================
|
||||
--- a/config.mk.in
|
||||
@@ -68,29 +68,3 @@ Index: b/lib/curl_transport/Makefile
|
||||
# We expect that curl-config --cflags just gives us -I options, because
|
||||
# we need just the -I options for 'make dep'. Plus, it's scary to think
|
||||
# of what any other compiler flag would do to our compile.
|
||||
Index: b/src/cpp/test/Makefile
|
||||
===================================================================
|
||||
--- a/src/cpp/test/Makefile
|
||||
+++ b/src/cpp/test/Makefile
|
||||
@@ -20,7 +20,7 @@
|
||||
LIBS := $(shell $(XMLRPC_C_CONFIG) client --ldadd)
|
||||
|
||||
ifeq ($(MUST_BUILD_CURL_CLIENT),yes)
|
||||
- LIBS += $(shell curl-config --libs)
|
||||
+ LIBS += $(shell $(CURL_CONFIG) --libs)
|
||||
endif
|
||||
ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
|
||||
LIBS += $(shell libwww-config --libs)
|
||||
Index: b/tools/common.mk
|
||||
===================================================================
|
||||
--- a/tools/common.mk
|
||||
+++ b/tools/common.mk
|
||||
@@ -15,7 +15,7 @@
|
||||
CLIENT_LDLIBS += $(shell libwww-config --libs)
|
||||
endif
|
||||
ifeq ($(MUST_BUILD_CURL_CLIENT),yes)
|
||||
- CLIENT_LDLIBS += $(shell curl-config --libs)
|
||||
+ CLIENT_LDLIBS += $(shell $(CURL_CONFIG) --libs)
|
||||
endif
|
||||
ifeq ($(MUST_BUILD_WININET_CLIENT),yes)
|
||||
CLIENT_LDLIBS += $(shell wininet-config --libs)
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
Fix build with gcc6
|
||||
|
||||
Downloaded from
|
||||
https://build.opensuse.org/package/view_file/devel:libraries:c_c++/xmlrpc-c/narrowing.patch
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
Index: xmlrpc-c-1.33.18/src/cpp/base64.cpp
|
||||
===================================================================
|
||||
--- xmlrpc-c-1.33.18.orig/src/cpp/base64.cpp
|
||||
+++ xmlrpc-c-1.33.18/src/cpp/base64.cpp
|
||||
@@ -14,7 +14,7 @@ using namespace xmlrpc_c;
|
||||
|
||||
namespace {
|
||||
|
||||
-char const table_a2b_base64[] = {
|
||||
+signed char const table_a2b_base64[] = {
|
||||
-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
|
||||
-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
|
||||
-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63,
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally computed
|
||||
sha256 8ae6ed4ec57d50ed132b1150fc5258346eef3e291501a564f14fa97586902f98 xmlrpc-c-1.25.30.tgz
|
||||
sha256 d830f3264a832dfe09f629cc64036acfd08121692526d0fabe090f7ff881ce08 xmlrpc-c-1.39.12.tgz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBXMLRPC_VERSION = 1.25.30
|
||||
LIBXMLRPC_VERSION = 1.39.12
|
||||
LIBXMLRPC_SOURCE = xmlrpc-c-$(LIBXMLRPC_VERSION).tgz
|
||||
LIBXMLRPC_SITE = http://downloads.sourceforge.net/project/xmlrpc-c/Xmlrpc-c%20Super%20Stable/$(LIBXMLRPC_VERSION)
|
||||
LIBXMLRPC_LICENSE = BSD-3c (xml-rpc main code and abyss web server), BSD like (lib/expat), Python 1.5.2 license (parts of xmlrpc_base64.c)
|
||||
|
||||
Reference in New Issue
Block a user