Update POCO to 1.11.0

vendor/POCO/build/config/ARM-Linux

@@ -12,6 +12,7 @@ LINKMODE           ?= SHARED
 TOOL               ?= arm-linux
 POCO_TARGET_OSNAME  = Linux
 POCO_TARGET_OSARCH ?= armv7l
+ARCHFLAGS          ?=
 
 #
 # Define Tools
@@ -39,10 +40,10 @@ SHAREDLIBLINKEXT = .so
 #
 # Compiler and Linker Flags
 #
-CFLAGS          = -std=c99
+CFLAGS          = -std=c11 $(ARCHFLAGS)
 CFLAGS32        =
 CFLAGS64        =
-CXXFLAGS        = -Wall -Wno-sign-compare
+CXXFLAGS        = -std=c++14 -Wall -Wno-sign-compare $(ARCHFLAGS)
 CXXFLAGS32      =
 CXXFLAGS64      =
 LINKFLAGS       =

vendor/POCO/build/config/Darwin

@@ -1,9 +1,9 @@
 #
 # Darwin
 #
-# Build settings for Mac OS X 10.9 (clang++, libc++, x86_64)
+# Build settings for Mac OS X 10.11 (clang++, libc++, x86_64)
 # The build settings defined in this file are compatible
 # with XCode C++ projects.
-# 
+#
 
 include $(POCO_BASE)/build/config/Darwin-clang-libc++

vendor/POCO/build/config/Darwin-clang

@@ -1,79 +1,10 @@
 #
 # Darwin-clang
 #
-# Build settings for Mac OS X 10.7 (clang, libstdc++, x86_64)
-# 
+# Build settings for Mac OS X 10.11 (clang, libstdc++, x86_64)
+#
 # NOTE: This build configuration will build 64-bit binaries.
 # Use the Darwin32-clang build configuration to build 32-bit binaries.
 #
 
-#
-# General Settings
-#
-LINKMODE ?= SHARED
-
-POCO_TARGET_OSARCH ?= x86_64
-POCO_HOST_OSARCH   := $(POCO_TARGET_OSARCH)
-ARCHFLAGS          ?= -arch $(POCO_TARGET_OSARCH) 
-OSFLAGS            ?= -mmacosx-version-min=10.7
-
-OPENSSL_DIR        ?= /usr/local/opt/openssl
-
-ifeq ($(POCO_TARGET_OSARCH),i386)
-RORELOCS = -read_only_relocs suppress
-endif
-
-#
-# Tools
-#
-CC      = $(shell xcrun -find clang)
-CXX     = $(shell xcrun -find clang++)
-LINK    = $(CXX) -bind_at_load
-LIB     = libtool -static -o
-RANLIB  = ranlib
-SHLIB   = $(CXX) -dynamiclib -Wl,-install_name,$(POCO_LIB_INSTALLDIR)/$(notdir \$@) -o $@
-DYLIB   = $(CXX) -dynamic -bundle $(RORELOCS) -Wl,-bind_at_load -o $@ 
-SHLIBLN = $(POCO_BASE)/build/script/shlibln
-STRIP   = 
-DEP     = $(POCO_BASE)/build/script/makedepend.clang
-SHELL   = sh
-RM      = rm -rf
-CP      = cp
-MKDIR   = mkdir -p
-
-#
-# Extension for Shared Libraries
-#
-SHAREDLIBEXT     = .$(target_version).dylib
-SHAREDLIBLINKEXT = .dylib
-
-#
-# Compiler and Linker Flags
-#
-CFLAGS          = $(ARCHFLAGS) $(OSFLAGS) -std=c99
-CXXFLAGS        = $(ARCHFLAGS) $(OSFLAGS) -std=c++03 -stdlib=libstdc++ -Wall -Wno-sign-compare -Wno-unused-variable -Wno-unused-function -Wno-unneeded-internal-declaration
-LINKFLAGS       = $(ARCHFLAGS) $(OSFLAGS) -stdlib=libstdc++
-SHLIBFLAGS      = $(ARCHFLAGS) $(OSFLAGS) -stdlib=libstdc++
-DYLIBFLAGS      = $(ARCHFLAGS) $(OSFLAGS) -stdlib=libstdc++
-STATICOPT_CC    =
-STATICOPT_CXX   =
-STATICOPT_LINK  =
-SHAREDOPT_CC    = -fPIC 
-SHAREDOPT_CXX   = -fPIC
-SHAREDOPT_LINK  = 
-DEBUGOPT_CC     = -O0 -g -gdwarf-2 -fasm-blocks -D_DEBUG=$(DEBUGLEVEL)
-DEBUGOPT_CXX    = -O0 -g -gdwarf-2 -fasm-blocks -D_DEBUG=$(DEBUGLEVEL) 
-DEBUGOPT_LINK   =
-RELEASEOPT_CC   = -DNDEBUG -Os -fasm-blocks
-RELEASEOPT_CXX  = -DNDEBUG -O2 -fasm-blocks
-RELEASEOPT_LINK =
-
-#
-# System Specific Flags
-#
-SYSFLAGS = -DPOCO_HAVE_IPv6 -DPOCO_NO_STAT64 -I$(OPENSSL_DIR)/include
-
-#
-# System Specific Libraries
-#
-SYSLIBS  = -L$(OPENSSL_DIR)/lib -ldl 
+include $(POCO_BASE)/build/config/Darwin-clang-libc++

vendor/POCO/build/config/Darwin-clang-libc++

@@ -1,30 +1,22 @@
 #
 # Darwin-clang-libc++
 #
-# Build settings for Mac OS X 10.9 (clang, libc++, x86_64)
+# Build settings for Mac OS X 10.11 and later (clang, libc++, x86_64/arm64)
 # The build settings defined in this file are compatible
 # with XCode C++ projects.
 #
-# NOTE: This build configuration will build 64-bit binaries.
-# Use the Darwin32-clang-libc++ build configuration to build 32-bit binaries.
-#
 
 #
 # General Settings
 #
 LINKMODE ?= SHARED
 
-POCO_TARGET_OSARCH ?= x86_64
-POCO_HOST_OSARCH   := $(POCO_TARGET_OSARCH)
-ARCHFLAGS          ?= -arch $(POCO_TARGET_OSARCH)
-OSFLAGS            ?= -mmacosx-version-min=10.9 -isysroot $(shell xcrun --show-sdk-path)
+ARCHFLAGS          ?= -arch $(OSARCH)
+SANITIZEFLAGS      ?=
+OSFLAGS            ?= -mmacosx-version-min=10.11 -isysroot $(shell xcrun --show-sdk-path)
 
 OPENSSL_DIR        ?= /usr/local/opt/openssl
 
-ifeq ($(POCO_TARGET_OSARCH),i386)
-RORELOCS = -read_only_relocs suppress
-endif
-
 #
 # Tools
 #
@@ -52,11 +44,11 @@ SHAREDLIBLINKEXT = .dylib
 #
 # Compiler and Linker Flags
 #
-CFLAGS          = $(ARCHFLAGS) $(OSFLAGS) -std=c99
-CXXFLAGS        = $(ARCHFLAGS) $(OSFLAGS) -std=c++14 -stdlib=libc++ -Wall -Wno-sign-compare -Wno-unused-variable -Wno-unused-function -Wno-unneeded-internal-declaration
-LINKFLAGS       = $(ARCHFLAGS) $(OSFLAGS) -stdlib=libc++
-SHLIBFLAGS      = $(ARCHFLAGS) $(OSFLAGS) -stdlib=libc++
-DYLIBFLAGS      = $(ARCHFLAGS) $(OSFLAGS) -stdlib=libc++
+CFLAGS          = $(ARCHFLAGS) $(OSFLAGS) $(SANITIZEFLAGS) -std=c11
+CXXFLAGS        = $(ARCHFLAGS) $(OSFLAGS) $(SANITIZEFLAGS) -std=c++14 -stdlib=libc++ -Wall -Wno-sign-compare -Wno-unused-variable -Wno-unused-function -Wno-unneeded-internal-declaration
+LINKFLAGS       = $(ARCHFLAGS) $(OSFLAGS) $(SANITIZEFLAGS) -stdlib=libc++
+SHLIBFLAGS      = $(ARCHFLAGS) $(OSFLAGS) $(SANITIZEFLAGS) -stdlib=libc++
+DYLIBFLAGS      = $(ARCHFLAGS) $(OSFLAGS) $(SANITIZEFLAGS) -stdlib=libc++
 STATICOPT_CC    =
 STATICOPT_CXX   =
 STATICOPT_LINK  =

vendor/POCO/build/config/Darwin32

@@ -1,12 +0,0 @@
-#
-# Darwin32
-#
-# Build settings for Mac OS X 10.9 (clang, libc++, i386)
-# The build settings defined in this file are compatible
-# with XCode C++ projects.
-# 
-
-ARCHFLAGS = -arch i386
-POCO_TARGET_OSARCH = i386
-
-include $(POCO_BASE)/build/config/Darwin-clang-libc++

vendor/POCO/build/config/Darwin32-clang

@@ -1,10 +0,0 @@
-#
-# Darwin32-clang
-#
-# Build settings for Mac OS X 10.7 (clang, libstdc++, i386)
-# 
-
-ARCHFLAGS = -arch i386
-POCO_TARGET_OSARCH = i386
-
-include $(POCO_BASE)/build/config/Darwin-clang

vendor/POCO/build/config/Darwin32-clang-libc++

@@ -1,12 +0,0 @@
-#
-# Darwin32-clang-libc++
-#
-# Build settings for Mac OS X 10.9 (clang, libc++, i386)
-# The build settings defined in this file are compatible
-# with XCode C++ projects.
-# 
-
-ARCHFLAGS = -arch i386
-POCO_TARGET_OSARCH = i386
-
-include $(POCO_BASE)/build/config/Darwin-clang-libc++

vendor/POCO/build/config/Darwin64

@@ -1,12 +1,9 @@
 #
 # Darwin64
 #
-# Build settings for Mac OS X 10.9 (clang, libc++, x86_64)
+# Build settings for Mac OS X 10.11 and later (clang, libc++, x86_64/arm64)
 # The build settings defined in this file are compatible
 # with XCode C++ projects.
-# 
-
-ARCHFLAGS = -arch x86_64
-POCO_TARGET_OSARCH = x86_64
+#
 
 include $(POCO_BASE)/build/config/Darwin-clang-libc++

vendor/POCO/build/config/Darwin64-clang

@@ -1,10 +1,9 @@
 #
 # Darwin64-clang
 #
-# Build settings for Mac OS X 10.7 (clang, libstdc++, x86_64)
-# 
-
-ARCHFLAGS = -arch x86_64
-POCO_TARGET_OSARCH = x86_64
+# Build settings for Mac OS X 10.11 and later (clang, libc++, x86_64/arm64)
+# The build settings defined in this file are compatible
+# with XCode C++ projects.
+#
 
 include $(POCO_BASE)/build/config/Darwin-clang

vendor/POCO/build/config/Darwin64-clang-libc++

@@ -1,12 +1,9 @@
 #
 # Darwin64-clang-libc++
 #
-# Build settings for Mac OS X 10.9 (clang, libc++, x86_64)
+# Build settings for Mac OS X 10.11 and later (clang, libc++, x86_64/arm64)
 # The build settings defined in this file are compatible
 # with XCode C++ projects.
-# 
-
-ARCHFLAGS = -arch x86_64
-POCO_TARGET_OSARCH = x86_64
+#
 
 include $(POCO_BASE)/build/config/Darwin-clang-libc++

vendor/POCO/build/config/Linux

@@ -1,7 +1,7 @@
 #
 # Linux
 #
-# Make settings for Linux 2.6/gcc 3.3
+# Make settings for Linux/gcc
 #
 #
 
@@ -10,6 +10,8 @@
 #
 LINKMODE ?= SHARED
 
+SANITIZEFLAGS ?=
+
 #
 # Define Tools
 #
@@ -21,7 +23,7 @@ RANLIB  = ${CROSS_COMPILE}ranlib
 SHLIB   = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
 STRIP   = ${CROSS_COMPILE}strip
-DEP     = $(POCO_BASE)/build/script/makedepend.gcc 
+DEP     = $(POCO_BASE)/build/script/makedepend.gcc
 SHELL   = sh
 RM      = rm -rf
 CP      = cp
@@ -36,13 +38,13 @@ SHAREDLIBLINKEXT = .so
 #
 # Compiler and Linker Flags
 #
-CFLAGS          = -std=c99
+CFLAGS          = $(SANITIZEFLAGS) -std=c11
 CFLAGS32        =
 CFLAGS64        =
-CXXFLAGS        = -Wall -Wno-sign-compare
+CXXFLAGS        = $(SANITIZEFLAGS) -std=c++14 -Wall -Wno-sign-compare
 CXXFLAGS32      =
 CXXFLAGS64      =
-LINKFLAGS       =
+LINKFLAGS       = $(SANITIZEFLAGS)
 LINKFLAGS32     =
 LINKFLAGS64     =
 STATICOPT_CC    =

vendor/POCO/build/config/iPhone

@@ -2,7 +2,7 @@
 # iPhone
 #
 # Build settings for iPhone OS, using Apple's iPhone SDK
-# 
+#
 
 #
 # General Settings
@@ -18,7 +18,7 @@ LINKMODE ?= STATIC
 # IPHONE_SDK_VERSION = 2.2.1
 
 # if IPHONE_SDK_VERSION_MIN is defined use that
-# Otherwise use the version found. 
+# Otherwise use the version found.
 
 IPHONE_SDK             ?= iPhoneOS
 IPHONE_SDK_ROOT        ?= $(shell xcode-select -print-path)/Platforms/$(IPHONE_SDK).platform/Developer/SDKs
@@ -45,9 +45,9 @@ LINK    = $(CXX) -bind_at_load
 LIB     = libtool -static -o
 RANLIB  = ranlib
 SHLIB   = $(CXX) $(OSFLAGS) -dynamiclib -Wl,-install_name,$@ -o $@
-DYLIB   = $(CXX) $(OSFLAGS) -dynamic -bundle -read_only_relocs suppress -Wl,-bind_at_load -o $@ 
+DYLIB   = $(CXX) $(OSFLAGS) -dynamic -bundle -read_only_relocs suppress -Wl,-bind_at_load -o $@
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
-STRIP   = 
+STRIP   =
 DEP     = $(POCO_BASE)/build/script/makedepend.gcc
 SHELL   = sh
 RM      = rm -rf
@@ -66,23 +66,23 @@ SHAREDLIBLINKEXT = .dylib
 CFLAGS          = $(OSFLAGS) -std=gnu99
 CFLAGS32        =
 CFLAGS64        =
-CXXFLAGS        = $(OSFLAGS) -std=gnu++11 -stdlib=libc++ -Wall -Wno-sign-compare 
+CXXFLAGS        = $(OSFLAGS) -std=gnu++14 -stdlib=libc++ -Wall -Wno-sign-compare
 CXXFLAGS32      =
-CXXFLAGS64      = 
+CXXFLAGS64      =
 LINKFLAGS       = $(OSFLAGS) -stdlib=libc++
 LINKFLAGS32     =
 LINKFLAGS64     =
 STATICOPT_CC    =
 STATICOPT_CXX   =
 STATICOPT_LINK  =
-SHAREDOPT_CC    = -fPIC 
+SHAREDOPT_CC    = -fPIC
 SHAREDOPT_CXX   = -fPIC
-SHAREDOPT_LINK  = 
+SHAREDOPT_LINK  =
 DEBUGOPT_CC     = -g -D_DEBUG=$(DEBUGLEVEL)
-DEBUGOPT_CXX    = -g -D_DEBUG=$(DEBUGLEVEL) 
+DEBUGOPT_CXX    = -g -D_DEBUG=$(DEBUGLEVEL)
 DEBUGOPT_LINK   =
 RELEASEOPT_CC   = -DNDEBUG -O2
-RELEASEOPT_CXX  = -DNDEBUG -O 
+RELEASEOPT_CXX  = -DNDEBUG -O
 RELEASEOPT_LINK =
 
 #

vendor/POCO/build/rules/compile

@@ -36,6 +36,9 @@ $(OBJPATH_RELEASE_STATIC) $(OBJPATH_DEBUG_STATIC) $(OBJPATH_RELEASE_SHARED) $(OB
 #
 # Rules for compiling
 #
+
+# Regular sources
+
 $(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
 	@echo "** Compiling" $< "(debug, static)"
 	$(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(STATICOPT_CXX) -c $< -o $@
@@ -68,9 +71,47 @@ $(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/c
 	@echo "** Compiling" $< "(release, shared)"
 	$(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(SHAREDOPT_CC) -c $< -o $@
 
+# Generated sources
+
+$(OBJPATH_DEBUG_STATIC)/%.o: $(GENDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
+	@echo "** Compiling" $< "(debug, static)"
+	$(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(STATICOPT_CXX) -c $< -o $@
+
+$(OBJPATH_RELEASE_STATIC)/%.o: $(GENDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
+	@echo "** Compiling" $< "(release, static)"
+	$(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(STATICOPT_CXX) -c $< -o $@
+
+$(OBJPATH_DEBUG_STATIC)/%.o: $(GENDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
+	@echo "** Compiling" $< "(debug, static)"
+	$(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(STATICOPT_CC) -c $< -o $@
+
+$(OBJPATH_RELEASE_STATIC)/%.o: $(GENDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
+	@echo "** Compiling" $< "(release, static)"
+	$(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(STATICOPT_CC) -c $< -o $@
+
+$(OBJPATH_DEBUG_SHARED)/%.o: $(GENDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
+	@echo "** Compiling" $< "(debug, shared)"
+	$(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@
+
+$(OBJPATH_RELEASE_SHARED)/%.o: $(GENDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
+	@echo "** Compiling" $< "(release, shared)"
+	$(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@
+
+$(OBJPATH_DEBUG_SHARED)/%.o: $(GENDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
+	@echo "** Compiling" $< "(debug, shared)"
+	$(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(SHAREDOPT_CC) -c $< -o $@
+
+$(OBJPATH_RELEASE_SHARED)/%.o: $(GENDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
+	@echo "** Compiling" $< "(release, shared)"
+	$(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(SHAREDOPT_CC) -c $< -o $@
+
+
 #
 # Rules for creating dependency information
 #
+
+# Regular sources rules
+
 $(DEPPATH)/%.d: $(SRCDIR)/%.cpp
 	@echo "** Creating dependency info for" $^
 	$(MKDIR) $(DEPPATH)
@@ -81,4 +122,16 @@ $(DEPPATH)/%.d: $(SRCDIR)/%.c
 	$(MKDIR) $(DEPPATH)
 	$(DEP) $(SRCDIR)/$(patsubst %.d,%.c,$(notdir $@)) $@ $(OBJPATH_DEBUG_STATIC) $(OBJPATH_RELEASE_STATIC) $(OBJPATH_DEBUG_SHARED) $(OBJPATH_RELEASE_SHARED) $(INCLUDE) $(CFLAGS)
 
+# Generated sources rules
+
+$(DEPPATH)/%.d: $(GENDIR)/%.cpp
+	@echo "** Creating dependency info for" $^
+	$(MKDIR) $(DEPPATH)
+	$(DEP) $(GENDIR)/$(patsubst %.d,%.cpp,$(notdir $@)) $@ $(OBJPATH_DEBUG_STATIC) $(OBJPATH_RELEASE_STATIC) $(OBJPATH_DEBUG_SHARED) $(OBJPATH_RELEASE_SHARED) $(INCLUDE) $(CXXFLAGS)
+
+$(DEPPATH)/%.d: $(GENDIR)/%.c
+	@echo "** Creating dependency info for" $^
+	$(MKDIR) $(DEPPATH)
+	$(DEP) $(GENDIR)/$(patsubst %.d,%.c,$(notdir $@)) $@ $(OBJPATH_DEBUG_STATIC) $(OBJPATH_RELEASE_STATIC) $(OBJPATH_DEBUG_SHARED) $(OBJPATH_RELEASE_SHARED) $(INCLUDE) $(CFLAGS)
+
 depend: $(addprefix $(DEPPATH)/,$(addsuffix .d,$(objects)))

vendor/POCO/build/rules/global

@@ -197,6 +197,7 @@ COMPONENT := $(shell $(POCO_BASE)/build/script/projname "$(PROJECT_BASE)")
 #
 SRCDIR   = src
 INCDIR   = include
+GENDIR   = gen
 LIBDIR   = lib/$(OSNAME)/$(OSARCH)
 BINDIR   = bin/$(OSNAME)/$(OSARCH)
 OBJDIR   = obj/$(OSNAME)/$(OSARCH)
@@ -229,6 +230,14 @@ else
 POCO_LIBRARY = -L$(POCO_BASE)/$(LIBDIR)
 endif
 
+ifeq ($(MACCHINA_BASE),)
+MACCHINA_LIBRARY =
+else ifeq ($(MACCHINA_BASE),$(PROJECT_BASE))
+MACCHINA_LIBRARY =
+else
+MACCHINA_LIBRARY = -L$(MACCHINA_BASE)/$(LIBDIR)
+endif
+
 ifndef LIBPREFIX
 LIBPREFIX = lib
 endif
@@ -309,7 +318,7 @@ INCLUDE = -Iinclude $(foreach p,$(COMPONENTS),-I$(POCO_BASE)/$(p)/$(INCDIR)) $(f
 #
 # Build Library Directory List
 #
-LIBRARY = -L$(LIBPATH) $(POCO_LIBRARY) $(foreach p,$(POCO_ADD_LIBRARY),-L$(p))
+LIBRARY = -L$(LIBPATH) $(POCO_LIBRARY) $(MACCHINA_LIBRARY) $(foreach p,$(POCO_ADD_LIBRARY),-L$(p))
 
 #
 # Strip Command definition