| 1 |
commit: 72e5e8c938fdcfcbae27c8cd37b4449e5c8623f4 |
| 2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 22 18:21:34 2022 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 22 18:24:22 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e5e8c9 |
| 7 |
|
| 8 |
dev-libs/flatbuffers: Fix base.h for locale define |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
| 12 |
|
| 13 |
...flatbuffers-2.0.6-locales-detection-fixup.patch | 26 ++++++++++++++++++++++ |
| 14 |
...rs-2.0.6.ebuild => flatbuffers-2.0.6-r1.ebuild} | 6 +++-- |
| 15 |
2 files changed, 30 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..6ab1b085876c |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-libs/flatbuffers/files/flatbuffers-2.0.6-locales-detection-fixup.patch |
| 22 |
@@ -0,0 +1,26 @@ |
| 23 |
+From f10f1fdeab9dedf8206965b73a52e02e3de3bc41 Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Jory Pratt <anarchy@g.o> |
| 25 |
+Date: Wed, 22 Jun 2022 13:09:43 -0500 |
| 26 |
+Subject: [PATCH] Fix base.h to only include locale support for glibc users |
| 27 |
+ |
| 28 |
+Signed-off-by: Jory Pratt <anarchy@g.o> |
| 29 |
+--- |
| 30 |
+ include/flatbuffers/base.h | 2 +- |
| 31 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 32 |
+ |
| 33 |
+diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h |
| 34 |
+index 458ac3f..46d6d80 100644 |
| 35 |
+--- a/include/flatbuffers/base.h |
| 36 |
++++ b/include/flatbuffers/base.h |
| 37 |
+@@ -262,7 +262,7 @@ namespace flatbuffers { |
| 38 |
+ #ifndef FLATBUFFERS_LOCALE_INDEPENDENT |
| 39 |
+ // Enable locale independent functions {strtof_l, strtod_l,strtoll_l, strtoull_l}. |
| 40 |
+ #if ((defined(_MSC_VER) && _MSC_VER >= 1800) || \ |
| 41 |
+- (defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21)))) |
| 42 |
++ (defined(__GLIBC__) && defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21)))) |
| 43 |
+ #define FLATBUFFERS_LOCALE_INDEPENDENT 1 |
| 44 |
+ #else |
| 45 |
+ #define FLATBUFFERS_LOCALE_INDEPENDENT 0 |
| 46 |
+-- |
| 47 |
+2.35.1 |
| 48 |
+ |
| 49 |
|
| 50 |
diff --git a/dev-libs/flatbuffers/flatbuffers-2.0.6.ebuild b/dev-libs/flatbuffers/flatbuffers-2.0.6-r1.ebuild |
| 51 |
similarity index 92% |
| 52 |
rename from dev-libs/flatbuffers/flatbuffers-2.0.6.ebuild |
| 53 |
rename to dev-libs/flatbuffers/flatbuffers-2.0.6-r1.ebuild |
| 54 |
index 64468eb1ae19..85b401a3de3a 100644 |
| 55 |
--- a/dev-libs/flatbuffers/flatbuffers-2.0.6.ebuild |
| 56 |
+++ b/dev-libs/flatbuffers/flatbuffers-2.0.6-r1.ebuild |
| 57 |
@@ -21,6 +21,10 @@ RESTRICT="test !test? ( test )" |
| 58 |
|
| 59 |
DOCS=( readme.md ) |
| 60 |
|
| 61 |
+PATCHES=( |
| 62 |
+ "${FILESDIR}"/${PN}-2.0.6-locales-detection-fixup.patch |
| 63 |
+) |
| 64 |
+ |
| 65 |
src_configure() { |
| 66 |
local mycmakeargs=( |
| 67 |
-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs) |
| 68 |
@@ -29,7 +33,5 @@ src_configure() { |
| 69 |
-DFLATBUFFERS_BUILD_BENCHMARKS=OFF |
| 70 |
) |
| 71 |
|
| 72 |
- use elibc_musl && mycmakeargs+=( -DFLATBUFFERS_LOCALE_INDEPENDENT=0 ) |
| 73 |
- |
| 74 |
cmake_src_configure |
| 75 |
} |
Archives