From eb34b4ea4250c36d951b14d7efce56de948be41f Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 25 Jul 2017 18:22:44 +1000 Subject: [PATCH] log4cxx: add patch header --- ...og4cxx-5-gcc6-fix-narrowing-conversion.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/log4cxx-5-gcc6-fix-narrowing-conversion.patch b/src/log4cxx-5-gcc6-fix-narrowing-conversion.patch index 48c744ed..ad07961f 100644 --- a/src/log4cxx-5-gcc6-fix-narrowing-conversion.patch +++ b/src/log4cxx-5-gcc6-fix-narrowing-conversion.patch @@ -1,3 +1,20 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +taken from: +https://github.com/mxe/mxe/pull/1817 + +g++ 6 is stricter regarding narrowing conversions in initializer +lists. This causes errors similar to the following during compilation +with the gcc6 or gcc7 overlays: +``` +locationinfo.cpp:163:21: error: narrowing conversion of '237' +from 'int' to 'char' inside { } [-Wnarrowing] +``` +This has already been fixed upstream in several consecutive patches, +but there's no release including those fixes yet. This patch consists +of the essence of said fixes. + + diff --git a/src/main/cpp/locationinfo.cpp b/src/main/cpp/locationinfo.cpp index e76ea29..1cdcf24 100644 --- a/src/main/cpp/locationinfo.cpp