manuelm

diff --git a/src/cloud_request.c b/src/cloud_request.c
index 5aeb88a..1de4cc3 100644
--- a/src/cloud_request.c
+++ b/src/cloud_request.c
@@ -346,7 +346,7 @@ int_t cloud_request(const char *server, int port, bool https, const char *uri, c
                     if (!binary)
                     {
                         // Properly terminate the string with a NULL character
-                        buffer[maxSize] = '\0';
+                        buffer[length] = '\0';

manuelm

--- clamav-0.99.3/libclamav/scanners.c.orig	2018-01-26 14:35:23.299386703 +0100
+++ clamav-0.99.3/libclamav/scanners.c	2018-01-26 14:47:44.422451335 +0100
@@ -1342,39 +1342,35 @@
 		return CL_CLEAN;
 	}
 
-	/* dump to disk only if explicitly asked to
-	 * or if necessary to check relative offsets,
-	 * otherwise we can process just in-memory */
-	if(ctx->engine->keeptmp || (troot && troot->ac_reloff_num > 0)) {

manuelm

diff -Naur missing/runtimelib/runtimelib.c ./runtimelib/runtimelib.c
--- missing/runtimelib/runtimelib.c     1970-01-01 01:00:00.000000000 +0100
+++ ./runtimelib/runtimelib.c   2016-05-15 19:29:27.288102521 +0200
@@ -0,0 +1,4 @@
+int myfct()
+{
+  return 123;
+}
diff -Naur missing/lib/mylib.c ./lib/mylib.c
--- missing/lib/mylib.c 1970-01-01 01:00:00.000000000 +0100

manuelm

diff --git a/src/bindings/cpp/include/keyset.hpp b/src/bindings/cpp/include/keyset.hpp
index 92cd2d2..7f06329 100644
--- a/src/bindings/cpp/include/keyset.hpp
+++ b/src/bindings/cpp/include/keyset.hpp
@@ -55,6 +55,10 @@ public:
        inline KeySet(const KeySet &other);
 
        inline explicit KeySet(size_t alloc, ...);
+       __attribute__((unused))
+       __attribute__((noinline))

manuelm

diff --git a/project/cmake/scripts/common/handle-depends.cmake b/project/cmake/scripts/common/handle-depends.cmake
index f0ae25f..eb0aae7 100644
--- a/project/cmake/scripts/common/handle-depends.cmake
+++ b/project/cmake/scripts/common/handle-depends.cmake
@@ -63,8 +63,11 @@ function(add_addon_depends addon searchpath)
         # TODO: figure out if we should use -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} ${ARCH_DEFINES}" and why it doesn't work
         # TODO: figure out why this doesn't work for OSX32 and IOS/ATV2
         if(NOT CMAKE_USER_MAKE_RULES_OVERRIDE AND NOT CMAKE_USER_MAKE_RULES_OVERRIDE_CXX AND NOT APPLE)
-          list(APPEND BUILD_ARGS -DCMAKE_C_FLAGS=${ARCH_DEFINES}
-                                 -DCMAKE_CXX_FLAGS=${ARCH_DEFINES})

manuelm

diff --git a/project/cmake/kodi-config.cmake.in b/project/cmake/kodi-config.cmake.in
index 0e3b158..5dcf42c 100644
--- a/project/cmake/kodi-config.cmake.in
+++ b/project/cmake/kodi-config.cmake.in
@@ -3,7 +3,7 @@ SET(APP_NAME @APP_NAME@)
 SET(APP_VERSION_MAJOR @APP_VERSION_MAJOR@)
 SET(APP_VERSION_MINOR @APP_VERSION_MINOR@)
 IF(NOT WIN32)
-  SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@")
+  SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS} @CXX11_SWITCH@")

manuelm

diff --git a/project/cmake/scripts/common/handle-depends.cmake b/project/cmake/scripts/common/handle-depends.cmake
index 255889a..ce88eb8 100644
--- a/project/cmake/scripts/common/handle-depends.cmake
+++ b/project/cmake/scripts/common/handle-depends.cmake
@@ -85,11 +85,13 @@ function(add_addon_depends addon searchpath)
                        -DENABLE_STATIC=1
                        -DBUILD_SHARED_LIBS=0)
         # if there are no make rules override files available take care of manually passing on ARCH_DEFINES
-        # TODO: figure out if we should use -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} ${ARCH_DEFINES}" and why it doesn't work
         # TODO: figure out why this doesn't work for OSX32 and IOS/ATV2

manuelm

diff --git a/project/cmake/addons/CMakeLists.txt b/project/cmake/addons/CMakeLists.txt
index 972261a..6c6bb04 100644
--- a/project/cmake/addons/CMakeLists.txt
+++ b/project/cmake/addons/CMakeLists.txt
@@ -228,6 +228,11 @@ foreach(id ${downloaded_addons})
                       SOURCE_DIR ${BUILD_DIR}/${id}
                       INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
                       CMAKE_ARGS ${BUILD_ARGS})
+  externalproject_add_step(${id} forcebuild
+                           COMMAND ${CMAKE_COMMAND} -E echo "Force build of ${id}"