diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-08-13 02:23:08 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-08-13 02:23:08 +0100 |
| commit | 4d4b75287f879f15ebdc56b3edd19737b6f936e8 (patch) | |
| tree | c02f05b73dd6c0a9d8b35dcb57c7eeaab6cfa9bc /dev-cpp/folly | |
| parent | f8ca23f9f6e4a55e4195e553ca2f3e7dd425f51c (diff) | |
gentoo auto-resync : 13:08:2022 - 02:23:08
Diffstat (limited to 'dev-cpp/folly')
| -rw-r--r-- | dev-cpp/folly/Manifest | 3 | ||||
| -rw-r--r-- | dev-cpp/folly/files/folly-2022.07.04.00-musl-fix.patch | 36 | ||||
| -rw-r--r-- | dev-cpp/folly/folly-2022.07.04.00.ebuild | 4 |
3 files changed, 42 insertions, 1 deletions
diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest index 9072a2d267fa..f866b126e6ad 100644 --- a/dev-cpp/folly/Manifest +++ b/dev-cpp/folly/Manifest @@ -1,7 +1,8 @@ +AUX folly-2022.07.04.00-musl-fix.patch 1150 BLAKE2B 6774badf3856fa94ae69dc4ca3fb3aca628dcf3b96fd7d141967815a9a07c07349f852a35275baba7b91d60e0c61dc3e1639cab4727666fa128d0334f36815a2 SHA512 15029e25b4da1f9cfe227978a54f63c198361df665b4657ef6a80ffdd3911c80be8e6c3799c8c16ff0fcca050932155628651a6e5ed566a41174dced9e51dc58 DIST folly-2022.03.28.00.tar.gz 3616507 BLAKE2B da003701abe599f20ac87a2785fe9a4cd4a8896d182737eb1eac6384f3d75a792225b426febea7cc4ea99aac1a1f31eb7330e0a297f43ae7d5aafccd93784560 SHA512 6eee07b3e82247c3c8672442503e9a69a1c4607604269fc0760e11a2d0e5595029e6995fbe7c970d2052a7f228f6b92112630e6d5c624369fc52e5ad1823ef74 DIST folly-2022.04.11.00.tar.gz 3632587 BLAKE2B 13820f6dc600727fa97603181be97a568cc8b3c713659717592853827dac050d5f1f6d98178e3054871233b48ac18f713589bf43b36ea29445cad557ce13bacf SHA512 7aa0be95d6f8b21aaa88558cf5921c526ab5a8c8121b858eb6e7ea19946d7a82dff06d90b7a365cef5c56a43d8d57af8d01b8b11b27262fbed9ee8c9e701b5ac DIST folly-v2022.07.04.00.tar.gz 3647988 BLAKE2B ab8916ff4be1468d44dc0892126448682554ea95ce879166f457b621c3157cb22d0292fe2c58744494efe0fbabbf77732184335cd22244724c740910cf3a8303 SHA512 11fc32768539d8d42c7396eeac522238450617c8dde302b45c64bb93fd6ceaef7bb193b897802962782e8211c3931d31bf8df68e06741ce855d9725510677d7a EBUILD folly-2022.03.28.00-r1.ebuild 1486 BLAKE2B 629e5c21603de6a7e91532219f357f74df50194e21102c6f2d05e6d613bbecdd5fba2f2042bcbac0dada2066b82def374c671d9c7b263ba3f1f3d16178496dc9 SHA512 2841732188df3b1330ce730aade4a15272208fd16d658c15a29b908963dd8ec1349205cdec2eb218d9acf539043db011498375f248f580730495cee2484a0e96 EBUILD folly-2022.04.11.00-r1.ebuild 1880 BLAKE2B 9bbab33cb481558b9f857eafb813901fa0a3ee9f977772f3d733a49b9e7c2656fb98ebd402f3f0d877e20c547f31e2ebdd1e9a3b234300e104858aec5e49d1a8 SHA512 aab53b44bee8c2a4bef0d5cc0dad9603f0a84b66db02dfa9062676e6bd97cb25fc6593dc2aa1881ab6cd3f5477f369717d0931e670447be3eec80e0161a5b98f -EBUILD folly-2022.07.04.00.ebuild 2243 BLAKE2B 0ce26c96eab6ff1797f9c6d893ef8dc7c7a7ceca3cecefcf3bf122793aeb707403a628803d0073a1ef3c29a7dea4f48534dcd71a25603336f31883fb485828d7 SHA512 8f48e795fac9adee9ea2483b9ccdc61571c40cc456f5255777b68e2c9aabee3bf6dedc586c013dff9efa7cab93de8f8450fbcbec70003ccbafaf3196a1c414f7 +EBUILD folly-2022.07.04.00.ebuild 2306 BLAKE2B 22c80cf66bdc690757b1463593491edd96810debd849bca0d8d125d6b004724c6305d3814a86322f7f86d2dc008a8267475e38ff829de5ac5dbc7286fdbe99ec SHA512 10c6535ba8e833d9bc6a580c9849d6d50c88e5b407cefaed48e292168bd6301db25447330f59f2e87fac596174cae965ad302bb3ad73ee3cbb7b65b3f3b9211a MISC metadata.xml 319 BLAKE2B 0c8d18b906a50ee77fef7db1f99206b1c4d38dfa7913de363474609bcce38956be8d0958bc400c704ad743396db7230fb0098c83f1caa16ca998d6fd5576369c SHA512 8b077d5d5bf60f0ed5b36aef48188f431ca0675f80190beb407a58fa48fc6f8a48db161b8cde775ab6cfb54a01438fa5edddf0098e80a65b29a403a7f3a2c027 diff --git a/dev-cpp/folly/files/folly-2022.07.04.00-musl-fix.patch b/dev-cpp/folly/files/folly-2022.07.04.00-musl-fix.patch new file mode 100644 index 000000000000..001af39625c5 --- /dev/null +++ b/dev-cpp/folly/files/folly-2022.07.04.00-musl-fix.patch @@ -0,0 +1,36 @@ +# Elf.cpp expects __ELF_NATIVE_CLASS to be defined at least for platforms +# besides FreeBSD-based ones, and so it defines FOLLY_ELF_NATIVE_CLASS with it. +# Without __ELF_NATIVE_CLASS (and apparently musl does not define it), +# FOLLY_ELF_NATIVE_CLASS is also not defined so what was supposed to be +# expanded to ELFCLASS32 or ELFCLASS64 ends up being +# ELFCLASSFOLLY_ELF_NATIVE_CLASS. +# +# Please refer: https://github.com/facebook/folly/issues/1478 +# +# Closes: https://bugs.gentoo.org/835744 +--- a/folly/experimental/symbolizer/Elf.cpp ++++ b/folly/experimental/symbolizer/Elf.cpp +@@ -39,12 +39,10 @@ + + #if defined(__ELF_NATIVE_CLASS) + #define FOLLY_ELF_NATIVE_CLASS __ELF_NATIVE_CLASS +-#elif defined(__FreeBSD__) +-#if defined(__LP64__) ++#elif defined(__LP64__) + #define FOLLY_ELF_NATIVE_CLASS 64 + #else + #define FOLLY_ELF_NATIVE_CLASS 32 +-#endif + #endif // __ELF_NATIVE_CLASS + + namespace folly { +--- a/folly/experimental/symbolizer/Elf.h ++++ b/folly/experimental/symbolizer/Elf.h +@@ -24,6 +24,7 @@ + #include <initializer_list> + #include <stdexcept> + #include <system_error> ++#include <sys/types.h> + + #include <folly/Conv.h> + #include <folly/Likely.h> diff --git a/dev-cpp/folly/folly-2022.07.04.00.ebuild b/dev-cpp/folly/folly-2022.07.04.00.ebuild index e4b9470d848e..4107d94ca13b 100644 --- a/dev-cpp/folly/folly-2022.07.04.00.ebuild +++ b/dev-cpp/folly/folly-2022.07.04.00.ebuild @@ -39,6 +39,10 @@ DEPEND="${RDEPEND} sys-libs/binutils-libs" BDEPEND="test? ( sys-devel/clang )" +PATCHES=( + "${FILESDIR}/${PN}"-2022.07.04.00-musl-fix.patch +) + pkg_setup() { [[ ${BUILD_TYPE} == "binary" ]] && return |