Hello community, here is the log from the commit of package neko for openSUSE:Factory checked in at 2017-09-05 15:19:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/neko (Old) and /work/SRC/openSUSE:Factory/.neko.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "neko" Tue Sep 5 15:19:42 2017 rev:5 rq:521017 version:2.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/neko/neko.changes 2017-06-23 09:17:51.846680108 +0200 +++ /work/SRC/openSUSE:Factory/.neko.new/neko.changes 2017-09-05 15:19:43.351265285 +0200 @@ -1,0 +2,5 @@ +Tue Sep 5 07:48:52 UTC 2017 - [email protected] + +- Add nekovm-xlocale.patch from upstream. + +------------------------------------------------------------------- New: ---- nekovm-xlocale.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ neko.spec ++++++ --- /var/tmp/diff_new_pack.7SRwlU/_old 2017-09-05 15:19:45.786922920 +0200 +++ /var/tmp/diff_new_pack.7SRwlU/_new 2017-09-05 15:19:45.790922357 +0200 @@ -35,6 +35,7 @@ Patch7: patch0007-CMAKE_INSTALL_LIBDIR.diff Patch8: nekovm-boot-c-1.patch Patch9: nekovm-boot-c-2.patch +Patch10: nekovm-xlocale.patch BuildRequires: cmake BuildRequires: ninja BuildRequires: pkgconfig @@ -99,6 +100,7 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %build %define __builder ninja ++++++ nekovm-xlocale.patch ++++++ >From e286c8f3301fa443255a3101d14b7392467051b8 Mon Sep 17 00:00:00 2001 From: Andy Li <[email protected]> Date: Thu, 13 Jul 2017 13:23:33 +0800 Subject: [PATCH] include xlocale.h only if it is available since it is removed in recent glibc see: https://bugzilla.redhat.com/show_bug.cgi?id=1464244 --- CMakeLists.txt | 3 +++ libs/std/sys.c | 4 ++++ vm/neko.h.in | 2 ++ 3 files changed, 9 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ include(GNUInstallDirs) include(CheckCCompilerFlag) +include(CheckIncludeFile) project(neko C) set(CMAKE_OSX_ARCHITECTURES x86_64) @@ -59,6 +60,8 @@ set(NEKO_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/neko) endif() +check_include_file(xlocale.h HAVE_XLOCALE_H) + configure_file ( "${CMAKE_SOURCE_DIR}/vm/neko.h.in" "${CMAKE_BINARY_DIR}/neko.h" diff --git a/libs/std/sys.c b/libs/std/sys.c index 62d3cb15..21f62b3b 100644 --- a/libs/std/sys.c +++ b/libs/std/sys.c @@ -41,7 +41,11 @@ # include <sys/time.h> # include <sys/times.h> # include <sys/wait.h> +#ifdef HAVE_XLOCALE_H # include <xlocale.h> +#else +# include <locale.h> +#endif #endif #ifdef NEKO_MAC diff --git a/vm/neko.h.in b/vm/neko.h.in index c0623bc3..7db3c150 100644 --- a/vm/neko.h.in +++ b/vm/neko.h.in @@ -88,6 +88,8 @@ # include <stdint.h> #endif +#cmakedefine HAVE_XLOCALE_H + #define NEKO_VERSION_MAJOR @NEKO_VERSION_MAJOR@ #define NEKO_VERSION_MINOR @NEKO_VERSION_MINOR@ #define NEKO_VERSION_PATCH @NEKO_VERSION_PATCH@
