diff options
| author |   Violet Purcell <vimproved@inventati.org> | 2023-06-08 15:23:15 +0000 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-07-11 05:34:18 +0100 |
| commit | 942655e1b33d88253997d5a1174fff8e3d0c9230 (patch) | |
| tree | 361f5e93ae9df50409acf0701277f3227e87a051 /dev-libs/tinyxml2 | |
| parent | sci-libs/dealii: add 9.5.0 (diff) | |
| download | gentoo-942655e1b33d88253997d5a1174fff8e3d0c9230.tar.gz gentoo-942655e1b33d88253997d5a1174fff8e3d0c9230.tar.bz2 gentoo-942655e1b33d88253997d5a1174fff8e3d0c9230.zip | |
dev-libs/tinyxml2: Fix build with musl 1.2.4
Closes: https://bugs.gentoo.org/905999
Signed-off-by: Violet Purcell <vimproved@inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/31356
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-libs/tinyxml2')
| -rw-r--r-- | dev-libs/tinyxml2/files/tinyxml2-9.0.0-musl-1.2.4.patch | 51 | ||||
| -rw-r--r-- | dev-libs/tinyxml2/tinyxml2-9.0.0-r1.ebuild | 4 |
2 files changed, 55 insertions, 0 deletions
diff --git a/dev-libs/tinyxml2/files/tinyxml2-9.0.0-musl-1.2.4.patch b/dev-libs/tinyxml2/files/tinyxml2-9.0.0-musl-1.2.4.patch new file mode 100644 index 000000000000..2670d4ffa913 --- /dev/null +++ b/dev-libs/tinyxml2/files/tinyxml2-9.0.0-musl-1.2.4.patch @@ -0,0 +1,51 @@ +Bug: https://bugs.gentoo.org/905999 +Upstream: https://leethomason/tinyxml2/pull/945 + +From dfcb914e8bbbb2dca146a3cee62f66fff7ea163b Mon Sep 17 00:00:00 2001 +From: Violet Purcell <vimproved@inventati.org> +Date: Thu, 8 Jun 2023 15:19:41 +0000 +Subject: [PATCH] Remove LFS64 calls and set _FILE_OFFSET_BITS=64 + +Musl 1.2.4 made the LFS64 interfaces only available when +_LARGEFILE64_SOURCE is defined, and they will be removed altogether in +Musl 1.2.5. This commit replaces the LFS64 calls with their non-LFS64 +versions and defines _FILE_OFFSET_BITS=64, which makes all interfaces +64-bit. + +Bug: https://bugs.gentoo.org/905999 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,6 +31,7 @@ target_compile_definitions( + PUBLIC $<$<CONFIG:Debug>:TINYXML2_DEBUG>
+ INTERFACE $<$<BOOL:${BUILD_SHARED_LIBS}>:TINYXML2_IMPORT>
+ PRIVATE $<$<CXX_COMPILER_ID:MSVC>:_CRT_SECURE_NO_WARNINGS>
++ PUBLIC _FILE_OFFSET_BITS=64
+ )
+
+ set_target_properties(
+--- a/Makefile ++++ b/Makefile +@@ -10,7 +10,7 @@ ARFLAGS = cr + RM = rm -f + RANLIB = ranlib + MKDIR = mkdir -p +-CXXFLAGS = -fPIC ++CXXFLAGS = -D_FILE_OFFSET_BITS=64 -fPIC + + INSTALL = install + INSTALL_PROGRAM = $(INSTALL) +--- a/tinyxml2.cpp ++++ b/tinyxml2.cpp +@@ -106,9 +106,6 @@ distribution. + #elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__ANDROID__)
+ #define TIXML_FSEEK fseeko
+ #define TIXML_FTELL ftello
+-#elif defined(__unix__) && defined(__x86_64__)
+- #define TIXML_FSEEK fseeko64
+- #define TIXML_FTELL ftello64
+ #else
+ #define TIXML_FSEEK fseek
+ #define TIXML_FTELL ftell
+-- +2.41.0 + diff --git a/dev-libs/tinyxml2/tinyxml2-9.0.0-r1.ebuild b/dev-libs/tinyxml2/tinyxml2-9.0.0-r1.ebuild index c7e2537dcb14..628efc0dcde4 100644 --- a/dev-libs/tinyxml2/tinyxml2-9.0.0-r1.ebuild +++ b/dev-libs/tinyxml2/tinyxml2-9.0.0-r1.ebuild @@ -16,6 +16,10 @@ KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv sparc x86" IUSE="test" RESTRICT="!test? ( test )" +PATCHES=( + "${FILESDIR}/${P}-musl-1.2.4.patch" +) + src_configure() { local mycmakeargs=( -DBUILD_TESTING=$(usex test) |