From 3b466ae9f15a33737b6ac2d2738a43978d6f06c0 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 4 May 2023 16:33:16 +0200 Subject: [PATCH] app-crypt/libmd: Sync with Gentoo It's from Gentoo commit ab05255b246cfca95025d9f966e62028f4242dea. --- ...sion-script-linker-support-detection.patch | 38 +++++++++++++++++++ .../app-crypt/libmd/libmd-1.0.4.ebuild | 17 +++++++-- .../app-crypt/libmd/libmd-9999.ebuild | 27 ------------- .../app-crypt/libmd/metadata.xml | 8 +++- 4 files changed, 59 insertions(+), 31 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/libmd/files/libmd-1.0.4-fix-version-script-linker-support-detection.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/libmd/libmd-9999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/libmd/files/libmd-1.0.4-fix-version-script-linker-support-detection.patch b/sdk_container/src/third_party/portage-stable/app-crypt/libmd/files/libmd-1.0.4-fix-version-script-linker-support-detection.patch new file mode 100644 index 0000000000..bcee3a0661 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/libmd/files/libmd-1.0.4-fix-version-script-linker-support-detection.patch @@ -0,0 +1,38 @@ +From e408786075b9540f76783f5c3ce87f6d1ece13cf Mon Sep 17 00:00:00 2001 +From: Guillem Jover +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. + + +Bug: https://bugs.gentoo.org/894010 +Upstream issue: https://gitlab.freedesktop.org/libbsd/libmd/-/issues/1 +Upstream commit: https://gitlab.freedesktop.org/libbsd/libmd/-/commit/e408786075b9540f76783f5c3ce87f6d1ece13cf + +--- + m4/libmd-linker.m4 | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/m4/libmd-linker.m4 b/m4/libmd-linker.m4 +index 7d1236a..3d6edcd 100644 +--- a/m4/libmd-linker.m4 ++++ b/m4/libmd-linker.m4 +@@ -8,7 +8,11 @@ AC_DEFUN([LIBMD_LINKER_VERSION_SCRIPT], [ + 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; } ++]], [[ ++]]) + ], [ + libmd_cv_version_script=yes + ], [ +-- +GitLab + diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/libmd/libmd-1.0.4.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/libmd/libmd-1.0.4.ebuild index ec9a537d5a..1cae95fb39 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/libmd/libmd-1.0.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/libmd/libmd-1.0.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit multilib-minimal +inherit autotools multilib-minimal DESCRIPTION="Message Digest functions from BSD systems" HOMEPAGE="https://www.hadrons.org/software/libmd/" @@ -11,7 +11,18 @@ SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz" LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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" + +PATCHES=( + "${FILESDIR}/${P}-fix-version-script-linker-support-detection.patch" +) + +src_prepare() { + default + + # Drop on next release, only needed for lld patch + eautoreconf +} multilib_src_configure() { ECONF_SOURCE="${S}" econf diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/libmd/libmd-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/libmd/libmd-9999.ebuild deleted file mode 100644 index b28c93edaf..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/libmd/libmd-9999.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools multilib-minimal git-r3 - -DESCRIPTION="Message Digest functions from BSD systems" -HOMEPAGE="https://www.hadrons.org/software/libmd/" -EGIT_REPO_URI="https://git.hadrons.org/git/libmd.git" - -LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )" -SLOT="0" - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf -} - -multilib_src_install() { - default - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/libmd/metadata.xml b/sdk_container/src/third_party/portage-stable/app-crypt/libmd/metadata.xml index 85e4ed814f..0c7ca90940 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/libmd/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-crypt/libmd/metadata.xml @@ -1,5 +1,11 @@ - + + base-system@gentoo.org + Gentoo Base System + + + libbsd/libmd +