mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-26 16:11:56 +02:00
dev-libs/libbsd: Sync with Gentoo
It's from Gentoo commit c96099a85a04059aeaff04df8f59f844822fba01.
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
3e3393e36e
commit
1c550851e2
@ -1,5 +1,3 @@
|
||||
DIST libbsd-0.11.7.tar.xz 418508 BLAKE2B 2ff0aa951c5b37a58ab101aade52d077d52f3695bb8535c99dec89659775501d93af16f164fef946776f445ee88a276d00870f64cb3fef58942ce26af6d2eaa9 SHA512 51fda4724f41dd8a4628afd58c21236a7588d9045e337e06eeabf83805a9aaaa53705441ca901ad11f1c65f18e881523bdc97721a7d3d6a5cced27f2450d09a2
|
||||
DIST libbsd-0.11.7.tar.xz.asc 833 BLAKE2B 925cd4f5b68c0dccceb476cb188bb5a8185ad77895b9b458ff6819ae241dbd8cbf1c18dd12d10b90b3a9ea3f9e065b44566d1a908d0c111ecbd435434b922a66 SHA512 bdcce69ee261039900896c5be48659f1b6b809f3a6e8a5220aac30a6687926ac29e478a3ea737727d077d6575ee11b86eed896932568fdd261a9aaeb46d695b6
|
||||
DIST libbsd-0.11.8.tar.xz 432376 BLAKE2B b2b9496423f177af7cba3c55c071b58a314ad987bd04fee5c93dc1885a501a923048f676d00dcb70c8cfa37de775c6ec64224dfecce1d0eaed50b8c27ec0c001 SHA512 0173fc20e2471f96bc6677500a02fbccef7463e023445f47681843c9a94b1fa9970c5af7d2f87f1a1e7f8a7bb60112988defc073828fd2a0dcd0e66e44e67295
|
||||
DIST libbsd-0.11.8.tar.xz.asc 931 BLAKE2B 3841b81fa8bcdf0e27a41c769691dbefbb82073a18e3a30580794e0242c903bd0b512d31d6e897f8fa98ef3a3cf0dc08a413040ead00caa63f0b993396e1f2fe SHA512 a24355f9151f1da62e1f4f37280eec57ee7a32205b493d973d59231382c878e4373d4cf83ec41612536ef9361fe43e68331217c96c59b6741e7827272369ff2c
|
||||
DIST libbsd-0.12.1.tar.xz 444048 BLAKE2B 74af2c1f3254fe1e1527c31c5518a8097e9f3a377c497bdb40df262ae00e2244ae460c8f5df6c6533f83c02eaa08621ef1cfbc2a83b9bb28bd77433ff7c088bd SHA512 c45c7861b63295c118f53ce868437ad73887b6764708d0a348b796f5abe2cefc9adbb0dd3be23f6348d6bf63a9920a13b7f90d065299cac5a05ce0376211073a
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
https://bugs.gentoo.org/905912
|
||||
https://gitlab.freedesktop.org/libbsd/libbsd/-/merge_requests/24
|
||||
|
||||
From c36c29f014b0ef56a3aef984fa40b0e100b6f419 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 15 Dec 2022 09:02:22 -0800
|
||||
Subject: [PATCH] funopen: Replace off64_t with off_t in funopen_seek
|
||||
|
||||
AC_SYS_LARGEFILE in configure.ac is setting needed defines to make
|
||||
64bit off_t on relevant platforms.
|
||||
|
||||
Fixes build on musl
|
||||
|
||||
| ../../../../../../../../workspace/sources/libbsd/src/funopen.c:68:28: error: unknown type name 'off64_t'; did you mean 'off_t'?
|
||||
| funopen_seek(void *cookie, off64_t *offset, int whence)
|
||||
| ^~~~~~~
|
||||
| off_t
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
--- a/src/funopen.c
|
||||
+++ b/src/funopen.c
|
||||
@@ -65,7 +65,7 @@ funopen_write(void *cookie, const char *buf, size_t size)
|
||||
}
|
||||
|
||||
static int
|
||||
-funopen_seek(void *cookie, off64_t *offset, int whence)
|
||||
+funopen_seek(void *cookie, off_t *offset, int whence)
|
||||
{
|
||||
struct funopen_cookie *cookiewrap = cookie;
|
||||
off_t soff = *offset;
|
||||
--
|
||||
GitLab
|
||||
@ -1,36 +0,0 @@
|
||||
From dec783dce5a7131e232a06e63a544645b5463dd8 Mon Sep 17 00:00:00 2001
|
||||
From: Guillem Jover <guillem@hadrons.org>
|
||||
Date: Sun, 12 Feb 2023 23:55:09 +0100
|
||||
Subject: [PATCH] build: Fix version script linker support detection
|
||||
|
||||
When the linker uses --no-undefined-version either specified by the user
|
||||
or as the default behavior (such as with newer clang >= 16 releases),
|
||||
a missing symbol definition will cause a linker error if that symbol is
|
||||
listed in the version script.
|
||||
|
||||
Upstream commit: https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/dec783dce5a7131e232a06e63a544645b5463dd8
|
||||
|
||||
---
|
||||
configure.ac | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 17d113c..7d17a93 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -33,7 +33,11 @@ AC_CACHE_CHECK([if ld supports --version-script flag],
|
||||
save_LDFLAGS=$LDFLAGS
|
||||
LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
|
||||
AC_LINK_IFELSE([
|
||||
- AC_LANG_PROGRAM([], [])
|
||||
+ AC_LANG_PROGRAM([[
|
||||
+extern int symbol(void);
|
||||
+int symbol(void) { return 0; }
|
||||
+]], [[
|
||||
+]])
|
||||
], [
|
||||
libbsd_cv_version_script=yes
|
||||
], [
|
||||
--
|
||||
2.39.1.615.ga0422de7ea.dirty
|
||||
|
||||
@ -1,61 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/guillemjover.asc
|
||||
inherit autotools multilib multilib-minimal verify-sig flag-o-matic
|
||||
|
||||
DESCRIPTION="Library to provide useful functions commonly found on BSD systems"
|
||||
HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
|
||||
SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
|
||||
SRC_URI+=" verify-sig? ( https://${PN}.freedesktop.org/releases/${P}.tar.xz.asc )"
|
||||
|
||||
LICENSE="BEER-WARE BSD BSD-2 BSD-4 ISC MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="static-libs"
|
||||
|
||||
RDEPEND="app-crypt/libmd[${MULTILIB_USEDEP}]"
|
||||
DEPEND="${RDEPEND}
|
||||
>=sys-kernel/linux-headers-3.17
|
||||
"
|
||||
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-guillemjover )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/libbsd-build-Fix-version-script-linker-support-detection.patch"
|
||||
"${FILESDIR}/libbsd-0.11.7-musl-lfs.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Drop on next release, only needed for lld patch
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
# Broken (still) with lld-17 (bug #922342, bug #915068)
|
||||
append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
|
||||
|
||||
# bug 911726, https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/26
|
||||
filter-flags -fno-semantic-interposition
|
||||
|
||||
# The build system will install libbsd-ctor.a despite USE="-static-libs"
|
||||
# which is correct, see:
|
||||
# https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
|
||||
ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
find "${ED}" -type f -name "*.la" -delete || die
|
||||
|
||||
# ld scripts on standalone prefix (RAP) systems should have the prefix
|
||||
# stripped from any paths, as the sysroot is automatically prepended.
|
||||
local ldscript=${ED}/usr/$(get_libdir)/${PN}$(get_libname)
|
||||
if use prefix && ! use prefix-guest && grep -qIF "ld script" "${ldscript}" 2>/dev/null; then
|
||||
sed -i "s|${EPREFIX}/|/|g" "${ldscript}" || die
|
||||
fi
|
||||
}
|
||||
@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://${PN}.freedesktop.org/releases/${P}.tar.xz.asc
|
||||
|
||||
LICENSE="BEER-WARE BSD BSD-2 BSD-4 ISC MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="static-libs"
|
||||
|
||||
RDEPEND="app-crypt/libmd[${MULTILIB_USEDEP}]"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user