diff options
| author |   Marek Szuba <marecki@gentoo.org> | 2024-04-03 18:39:38 +0100 |
|---|---|---|
| committer | Marek Szuba <marecki@gentoo.org> | 2024-04-03 18:41:21 +0100 |
| commit | 9f74a7f6ec5679c8361e93ee8c4eeeedc92dc140 (patch) | |
| tree | 490ed5a54b363498d4756dadf6dd20163b9f3be6 /sys-apps/the_silver_searcher | |
| parent | net-analyzer/openvas-scanner: destabilize 23.0.1 for ~amd64 (diff) | |
| download | gentoo-9f74a7f6ec5679c8361e93ee8c4eeeedc92dc140.tar.gz gentoo-9f74a7f6ec5679c8361e93ee8c4eeeedc92dc140.tar.bz2 gentoo-9f74a7f6ec5679c8361e93ee8c4eeeedc92dc140.zip | |
sys-apps/the_silver_searcher: phase out LFS64 interfaces
Closes: https://bugs.gentoo.org/908582
Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'sys-apps/the_silver_searcher')
| -rw-r--r-- | sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch | 41 | ||||
| -rw-r--r-- | sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild | 3 |
2 files changed, 43 insertions, 1 deletions
diff --git a/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch new file mode 100644 index 000000000000..62925a7fb1f0 --- /dev/null +++ b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch @@ -0,0 +1,41 @@ +LFS64 interfaces are now generally considered deprecated, and are no longer +available in MUSL since version 1.2.4. + +--- a/src/zfile.c ++++ b/src/zfile.c +@@ -4,7 +4,7 @@ + #include <sys/types.h> + + #ifdef __CYGWIN__ +-typedef _off64_t off64_t; ++typedef _off64_t off_t; + #endif + + #include <assert.h> +@@ -331,14 +331,14 @@ + } + + static int +-zfile_seek(void *cookie_, off64_t *offset_, int whence) { ++zfile_seek(void *cookie_, off_t *offset_, int whence) { + struct zfile *cookie = cookie_; +- off64_t new_offset = 0, offset = *offset_; ++ off_t new_offset = 0, offset = *offset_; + + if (whence == SEEK_SET) { + new_offset = offset; + } else if (whence == SEEK_CUR) { +- new_offset = (off64_t)cookie->logic_offset + offset; ++ new_offset = (off_t)cookie->logic_offset + offset; + } else { + /* SEEK_END not ok */ + return -1; +@@ -348,7 +348,7 @@ + return -1; + + /* Backward seeks to anywhere but 0 are not ok */ +- if (new_offset < (off64_t)cookie->logic_offset && new_offset != 0) { ++ if (new_offset < (off_t)cookie->logic_offset && new_offset != 0) { + return -1; + } + diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild index 68675d7bc043..1b9f8c8a60bb 100644 --- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild +++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,6 +30,7 @@ DOCS="README.md" PATCHES=( "${FILESDIR}"/${PN}-2.1.0-lzma.patch + "${FILESDIR}"/${PN}-2.2.0-no_lfs64.patch ) src_prepare() { |