[gentoo-commits] repo/gentoo:master commit in: dev-libs/flatbuffers/, dev-libs/flatbuffers/files/

[Jory Pratt]

commit:     72e5e8c938fdcfcbae27c8cd37b4449e5c8623f4
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 22 18:21:34 2022 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 18:24:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e5e8c9

dev-libs/flatbuffers: Fix base.h for locale define

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 ...flatbuffers-2.0.6-locales-detection-fixup.patch | 26 ++++++++++++++++++++++
 ...rs-2.0.6.ebuild => flatbuffers-2.0.6-r1.ebuild} |  6 +++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git 
a/dev-libs/flatbuffers/files/flatbuffers-2.0.6-locales-detection-fixup.patch 
b/dev-libs/flatbuffers/files/flatbuffers-2.0.6-locales-detection-fixup.patch
new file mode 100644
index 000000000000..6ab1b085876c
--- /dev/null
+++ b/dev-libs/flatbuffers/files/flatbuffers-2.0.6-locales-detection-fixup.patch
@@ -0,0 +1,26 @@
+From f10f1fdeab9dedf8206965b73a52e02e3de3bc41 Mon Sep 17 00:00:00 2001
+From: Jory Pratt <anar...@gentoo.org>
+Date: Wed, 22 Jun 2022 13:09:43 -0500
+Subject: [PATCH] Fix base.h to only include locale support for glibc users
+
+Signed-off-by: Jory Pratt <anar...@gentoo.org>
+---
+ include/flatbuffers/base.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h
+index 458ac3f..46d6d80 100644
+--- a/include/flatbuffers/base.h
++++ b/include/flatbuffers/base.h
+@@ -262,7 +262,7 @@ namespace flatbuffers {
+ #ifndef FLATBUFFERS_LOCALE_INDEPENDENT
+   // Enable locale independent functions {strtof_l, strtod_l,strtoll_l, 
strtoull_l}.
+   #if ((defined(_MSC_VER) && _MSC_VER >= 1800)            || \
+-       (defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && 
(!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && 
(__ANDROID_API__>=21))))
++       (defined(__GLIBC__) && defined(_XOPEN_VERSION) && 
(_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || 
(defined(__ANDROID_API__) && (__ANDROID_API__>=21))))
+     #define FLATBUFFERS_LOCALE_INDEPENDENT 1
+   #else
+     #define FLATBUFFERS_LOCALE_INDEPENDENT 0
+-- 
+2.35.1
+

diff --git a/dev-libs/flatbuffers/flatbuffers-2.0.6.ebuild 
b/dev-libs/flatbuffers/flatbuffers-2.0.6-r1.ebuild
similarity index 92%
rename from dev-libs/flatbuffers/flatbuffers-2.0.6.ebuild
rename to dev-libs/flatbuffers/flatbuffers-2.0.6-r1.ebuild
index 64468eb1ae19..85b401a3de3a 100644
--- a/dev-libs/flatbuffers/flatbuffers-2.0.6.ebuild
+++ b/dev-libs/flatbuffers/flatbuffers-2.0.6-r1.ebuild
@@ -21,6 +21,10 @@ RESTRICT="test !test? ( test )"
 
 DOCS=( readme.md )
 
+PATCHES=(
+       "${FILESDIR}"/${PN}-2.0.6-locales-detection-fixup.patch
+)
+
 src_configure() {
        local mycmakeargs=(
                -DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
@@ -29,7 +33,5 @@ src_configure() {
                -DFLATBUFFERS_BUILD_BENCHMARKS=OFF
        )
 
-       use elibc_musl && mycmakeargs+=( -DFLATBUFFERS_LOCALE_INDEPENDENT=0 )
-
        cmake_src_configure
 }