* [gentoo-commits] repo/gentoo:master commit in: dev-libs/flatbuffers/, dev-libs/flatbuffers/files/
@ 2022-06-22 18:24 Jory Pratt
0 siblings, 0 replies; 2+ messages in thread
From: Jory Pratt @ 2022-06-22 18:24 UTC (permalink / raw
To: gentoo-commits
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 <anarchy@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 <anarchy@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
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/flatbuffers/, dev-libs/flatbuffers/files/
@ 2023-02-03 15:17 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2023-02-03 15:17 UTC (permalink / raw
To: gentoo-commits
commit: e7b3c6d28da83abbcd2f5ecf2d279ad0669ce2f3
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 3 15:14:21 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 3 15:14:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7b3c6d2
dev-libs/flatbuffers: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-libs/flatbuffers/Manifest | 3 --
...flatbuffers-2.0.6-locales-detection-fixup.patch | 26 ---------------
dev-libs/flatbuffers/flatbuffers-2.0.6-r1.ebuild | 37 ----------------------
dev-libs/flatbuffers/flatbuffers-22.12.06.ebuild | 35 --------------------
dev-libs/flatbuffers/flatbuffers-23.1.4.ebuild | 35 --------------------
5 files changed, 136 deletions(-)
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index 87667c2f6406..31a16b3b3200 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,4 +1 @@
-DIST flatbuffers-2.0.6.tar.gz 1724250 BLAKE2B b6969b28dba753c4551b33d27409d9925c10a640ae860264f8054c19a470ce3da366c0bf7917bf7fe4f6cb57acbfbe1837f175fde40b84d311df6d1378d146ce SHA512 be631f34064c28d81876bf137c796e9736623cf2cc4f2a05dd45372e7195729c99fad1fa795f8ce71a408756a842edbdc0c3bc714a7cf63203a1de8681d86fb6
-DIST flatbuffers-22.12.06.gh.tar.gz 2172096 BLAKE2B 92bf0c56c10fa369e7a8a53a7f903af6b5f17560a3558587914c29ab8a655f3ee078c3e261426ca5d9ad0587419d4f0049459edc552e25958f80b80ba9539d59 SHA512 1b2c8eaa2ebeb92c3ebc363888b34b817d7b62a568e40bce2b037814f1f0103d4cb7db8507ec9ca05421be61b0b2be3edd6c4d564f75d1ce39278d73f8442ac1
DIST flatbuffers-23.1.21.gh.tar.gz 2181861 BLAKE2B 6368358c21e677feb466245a746b86cebb6d6a4058bb6d593de81bf3c32ddfb9fd475e4bb225d4529ea106253456a5ed1ee6d024b1e2521e02efef171750f428 SHA512 fa62188f773ad044644a58caf1e25bef417dfdea47c9da8a2ea7f997154b4f3976019e32e73cc533696a3d4e45ec4a8402b6df140878dfa2ff078740d61b4b0f
-DIST flatbuffers-23.1.4.gh.tar.gz 2178791 BLAKE2B 8c354c539378f7d8e05307f7ba0f5393265a6183fc8868d48b8da5ab7d39a3e7a7f85631db00f0dc57bf396d20652049303a79fbf31f07639d80596d300a7701 SHA512 8b3e1b9596a76548faca529fe5070e775be50bfdea079ba4f66014f5a1bfb93f8edd7e56f97363c897d2db8391277a9099a61d14e4298c3669ab7068bbf07865
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
deleted file mode 100644
index 6ab1b085876c..000000000000
--- a/dev-libs/flatbuffers/files/flatbuffers-2.0.6-locales-detection-fixup.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f10f1fdeab9dedf8206965b73a52e02e3de3bc41 Mon Sep 17 00:00:00 2001
-From: Jory Pratt <anarchy@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 <anarchy@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-r1.ebuild b/dev-libs/flatbuffers/flatbuffers-2.0.6-r1.ebuild
deleted file mode 100644
index 4fd61a266b9f..000000000000
--- a/dev-libs/flatbuffers/flatbuffers-2.0.6-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Memory efficient serialization library"
-HOMEPAGE="https://google.github.io/flatbuffers/"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-# From 1.2.0->2.0.0, incremented SONAME, although the interface didn't actually change.
-# (Apparently to adopt semver.)
-SLOT="0/2"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-IUSE="static-libs test"
-
-# out-of-source build broken, bug #842060
-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)
- -DFLATBUFFERS_BUILD_SHAREDLIB=ON
- -DFLATBUFFERS_BUILD_TESTS=$(usex test)
- -DFLATBUFFERS_BUILD_BENCHMARKS=OFF
- )
-
- cmake_src_configure
-}
diff --git a/dev-libs/flatbuffers/flatbuffers-22.12.06.ebuild b/dev-libs/flatbuffers/flatbuffers-22.12.06.ebuild
deleted file mode 100644
index d20c1234354b..000000000000
--- a/dev-libs/flatbuffers/flatbuffers-22.12.06.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Memory efficient serialization library"
-HOMEPAGE="
- https://google.github.io/flatbuffers/
- https://github.com/google/flatbuffers/
-"
-SRC_URI="
- https://github.com/google/flatbuffers/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-DOCS=( readme.md )
-
-src_configure() {
- local mycmakeargs=(
- -DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
- -DFLATBUFFERS_BUILD_SHAREDLIB=ON
- -DFLATBUFFERS_BUILD_TESTS=$(usex test)
- -DFLATBUFFERS_BUILD_BENCHMARKS=OFF
- )
-
- cmake_src_configure
-}
diff --git a/dev-libs/flatbuffers/flatbuffers-23.1.4.ebuild b/dev-libs/flatbuffers/flatbuffers-23.1.4.ebuild
deleted file mode 100644
index fe724780b7de..000000000000
--- a/dev-libs/flatbuffers/flatbuffers-23.1.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Memory efficient serialization library"
-HOMEPAGE="
- https://google.github.io/flatbuffers/
- https://github.com/google/flatbuffers/
-"
-SRC_URI="
- https://github.com/google/flatbuffers/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-DOCS=( readme.md )
-
-src_configure() {
- local mycmakeargs=(
- -DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
- -DFLATBUFFERS_BUILD_SHAREDLIB=ON
- -DFLATBUFFERS_BUILD_TESTS=$(usex test)
- -DFLATBUFFERS_BUILD_BENCHMARKS=OFF
- )
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-03 15:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-03 15:17 [gentoo-commits] repo/gentoo:master commit in: dev-libs/flatbuffers/, dev-libs/flatbuffers/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2022-06-22 18:24 Jory Pratt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox