gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

dev-cpp/lucene++: fix building tests with clang-22

Browse Source 
Closes: https://bugs.gentoo.org/973146
Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/724
Merges: https://codeberg.org/gentoo/gentoo/pulls/724
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Holger Hoffstätte
2026-04-24 14:32:26 +02:00
committed by Sam James
parent 2551200826
commit c8aee3f6fc
2 changed files with 71 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
dev-cpp/lucene++/files/lucene++-3.0.9-no-inline.patch Normal file
View File

@@ -0,0 +1,70 @@
From https://github.com/luceneplusplus/LucenePlusPlus/pull/200
Bug: https://bugs.gentoo.org/973146
Pruned compiler errors to relevant lines.
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Sat, 24 Feb 2024 21:26:58 +0100
Subject: [PATCH] Update DefaultSimilarity.cpp
This fixes a linker failure when building tests (lto related?)
https://launchpadlibrarian.net/715939877/buildlog_ubuntu-noble-amd64.lucene++_3.0.9-1_BUILDING.txt.gz
..
/usr/bin/ld: /tmp/ccUJivoA.ltrans35.ltrans.o:(.data.rel.ro+0x558): undefined reference to `Lucene::DefaultSimilarity::queryNorm(double)'
/usr/bin/ld: /tmp/ccUJivoA.ltrans35.ltrans.o:(.data.rel.ro+0x568): undefined reference to `Lucene::DefaultSimilarity::sloppyFreq(int)'
/usr/bin/ld: /tmp/ccUJivoA.ltrans35.ltrans.o:(.data.rel.ro+0x570): undefined reference to `Lucene::DefaultSimilarity::tf(double)'
/usr/bin/ld: /tmp/ccUJivoA.ltrans35.ltrans.o:(.data.rel.ro+0x588): undefined reference to `Lucene::DefaultSimilarity::idf(int, int)'
/usr/bin/ld: /tmp/ccUJivoA.ltrans35.ltrans.o:(.data.rel.ro+0x590): undefined reference to `Lucene::DefaultSimilarity::coord(int, int)'
/usr/bin/ld: /tmp/ccUJivoA.ltrans72.ltrans.o:(.data.rel.ro+0x360): undefined reference to `Lucene::DefaultSimilarity::lengthNorm(std::__cxx11::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > const&, int)'
..
---
src/core/search/DefaultSimilarity.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/core/search/DefaultSimilarity.cpp b/src/core/search/DefaultSimilarity.cpp
index c98f2d95..da4c3db2 100644
--- a/src/core/search/DefaultSimilarity.cpp
+++ b/src/core/search/DefaultSimilarity.cpp
@@ -27,35 +27,35 @@ double DefaultSimilarity::computeNorm(const String& fieldName, const FieldInvert
return (state->getBoost() * lengthNorm(fieldName, numTerms));
}
-inline double DefaultSimilarity::lengthNorm(const String& fieldName, int32_t numTokens) {
+double DefaultSimilarity::lengthNorm(const String& fieldName, int32_t numTokens) {
return (double)(1.0 / std::sqrt((double)numTokens));
}
-inline double DefaultSimilarity::queryNorm(double sumOfSquaredWeights) {
+double DefaultSimilarity::queryNorm(double sumOfSquaredWeights) {
return (double)(1.0 / std::sqrt(sumOfSquaredWeights));
}
-inline double DefaultSimilarity::tf(double freq) {
+double DefaultSimilarity::tf(double freq) {
return (double)std::sqrt(freq);
}
-inline double DefaultSimilarity::sloppyFreq(int32_t distance) {
+double DefaultSimilarity::sloppyFreq(int32_t distance) {
return (1.0 / (double)(distance + 1));
}
-inline double DefaultSimilarity::idf(int32_t docFreq, int32_t numDocs) {
+double DefaultSimilarity::idf(int32_t docFreq, int32_t numDocs) {
return (double)(std::log((double)numDocs / (double)(docFreq + 1)) + 1.0);
}
-inline double DefaultSimilarity::coord(int32_t overlap, int32_t maxOverlap) {
+double DefaultSimilarity::coord(int32_t overlap, int32_t maxOverlap) {
return (double)overlap / (double)maxOverlap;
}
-inline void DefaultSimilarity::setDiscountOverlaps(bool v) {
+void DefaultSimilarity::setDiscountOverlaps(bool v) {
discountOverlaps = v;
}
-inline bool DefaultSimilarity::getDiscountOverlaps() {
+bool DefaultSimilarity::getDiscountOverlaps() {
return discountOverlaps;
}

1
dev-cpp/lucene++/lucene++-3.0.9-r2.ebuild
View File

@@ -33,6 +33,7 @@ PATCHES=(
"${FILESDIR}/${PN}-3.0.9-gcc15.patch"
"${FILESDIR}/${PN}-3.0.9-boost-1.89.patch"
"${FILESDIR}/${PN}-3.0.9-boost-1.90.patch"
"${FILESDIR}/${PN}-3.0.9-no-inline.patch"
)
src_configure() {