diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-07-11 10:29:19 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-07-11 10:29:19 +0100 |
| commit | f9a53aec073578673710687755db617717dd87d3 (patch) | |
| tree | 9e9642aae0c5bc25cac799d6a2437229bbb76a76 /dev-libs/tinyxml2 | |
| parent | 7e110ec617b903791c3d309845e11a8b27f441cc (diff) | |
gentoo auto-resync : 11:07:2023 - 10:29:18
Diffstat (limited to 'dev-libs/tinyxml2')
| -rw-r--r-- | dev-libs/tinyxml2/Manifest | 3 | ||||
| -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 |
3 files changed, 57 insertions, 1 deletions
diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest index d2533565abf6..5e22ae727e44 100644 --- a/dev-libs/tinyxml2/Manifest +++ b/dev-libs/tinyxml2/Manifest @@ -1,3 +1,4 @@ +AUX tinyxml2-9.0.0-musl-1.2.4.patch 1565 BLAKE2B 135e0582ac59bb42667b23151f112717f224e81bbb9dd9f296d89cc09f1c3cdeba63470df4d3d0cfed912db1279901cdc7b925107150b6c8671450f350bfaac0 SHA512 0aa980e8f189e71db2cdac4de542b95018bbf7e0b5b54b6649274d7773737acc888c81e1a03d63836330196375f9022e95ca2e8bf6c803773c4fdb74e383bd08 DIST tinyxml2-9.0.0.tar.gz 619734 BLAKE2B 9a7bb8b8158417aa505e3d9fcc246b0bede52d6d4d5ff1b5cee891c2b72d1ee43d00ccea001ac24500f52c36320994b3446f3898ab2be1997940dbff526bc78e SHA512 9c5ce8131984690df302ca3e32314573b137180ed522c92fd631692979c942372a28f697fdb3d5e56bcf2d3dc596262b724d088153f3e1d721c9536f2a883367 -EBUILD tinyxml2-9.0.0-r1.ebuild 627 BLAKE2B 299afb05f839a7b282e96b51080b106b38c6c2269b2ccdfa2a540f632539de96f6686c2c091200235dce059c4e2c8573e40f1ef9e3dfb975b8481d1095af697f SHA512 a22927da5a452c1cbb42273b817436a1214d7dbca4b840bf5579753f212a6ca2cfa9af8c31df980893a2d979b8730fc720f8a3d2aba60bc4ae9ea5d667b07185 +EBUILD tinyxml2-9.0.0-r1.ebuild 677 BLAKE2B 5abb0ca2424f04d593b431cc4104ae59d88d257ab5e9759f90178b709200878762e78083a2f1914d2683ed872e07a30ea7056d28bef1b0e8382d2f706c426171 SHA512 4bc0601ba52237a8fd74aa85b99b942f6bfeb26b4bc2a73d12913ce5947f79e3dd75bece2b063abe8cb3543235115be2e805b81739846577a53bf2b6d67cc147 MISC metadata.xml 355 BLAKE2B 6be5c6bba810888d84a8e4c04a01116b36d2bce9ee5bbdfdb291312fa77e3cc85671e72aa3fe1d5c495d036bfd96930e8b5b3c782b9cc71ecef97729823c0241 SHA512 3c40ff5e22cfa8a3ea1c54e132f6c1d6698fa87659a14862e52267c0f80109527d7a872f92b8dcbcabc6ecbec11b3e51ce4b8329325857d465114c4600c8eed6 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) |