commit: e65483f454acedbf2caae633be3d03309fd492a5 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sun Feb 12 18:46:57 2023 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Feb 12 18:47:10 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e65483f4
sys-libs/efivar: drop 37 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-libs/efivar/Manifest | 1 - sys-libs/efivar/efivar-37.ebuild | 42 ------------------------ sys-libs/efivar/files/efivar-37-ia64-relro.patch | 37 --------------------- 3 files changed, 80 deletions(-) diff --git a/sys-libs/efivar/Manifest b/sys-libs/efivar/Manifest index 450ec0b1c8a3..70de2f8e537c 100644 --- a/sys-libs/efivar/Manifest +++ b/sys-libs/efivar/Manifest @@ -1,2 +1 @@ -DIST efivar-37.tar.bz2 109431 BLAKE2B 813d477d31562b773f6e19f20e9e237b94beed437ce221771770e7d46ff0e657530285f035dc942cc20609185be92dc50319bfe8e10dee642c8bd88403ef6ffe SHA512 305a82ed103c7e3d8f723934019d552677c73558768dd5341f87d0364f5c60824d24f5a8e1bf90075e825908085083d4ecdccec5ac757fd38ee6ac8fea28c3e4 DIST efivar-38.tar.bz2 320221 BLAKE2B 0b96f3d71ddc2246e6a11a5cd32af3d007823c4a283186a428c3f145cd74425a31bd22c4671ad1ab252a3c572991bb1698381cb8bdf51efcbebd62befdc6c070 SHA512 c2f17297c863ece134a9dd758d237fd2df8c8d072f87af1d0bf2bcf9acfc7a53c25597f03fd4fb8cc664b205743d4ffa0ef1b068d0f73c58fa573d40993f3155 diff --git a/sys-libs/efivar/efivar-37.ebuild b/sys-libs/efivar/efivar-37.ebuild deleted file mode 100644 index e6751c0136da..000000000000 --- a/sys-libs/efivar/efivar-37.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Tools and library to manipulate EFI variables" -HOMEPAGE="https://github.com/rhinstaller/efivar"; -SRC_URI="https://github.com/rhinstaller/efivar/releases/download/${PV}/${P}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0/1" -KEYWORDS="amd64 arm arm64 ~ia64 ppc64 ~riscv x86" - -RDEPEND="dev-libs/popt" -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-3.18 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-37-ia64-relro.patch -) - -src_prepare() { - default - sed -i -e 's/-Werror //' gcc.specs || die -} - -src_configure() { - tc-export CC - export CC_FOR_BUILD=$(tc-getBUILD_CC) - tc-ld-disable-gold - export libdir="/usr/$(get_libdir)" - unset LIBS # Bug 562004 - - if [[ -n ${GCC_SPECS} ]]; then - # The environment overrides the command line. - GCC_SPECS+=":${S}/gcc.specs" - fi -} diff --git a/sys-libs/efivar/files/efivar-37-ia64-relro.patch b/sys-libs/efivar/files/efivar-37-ia64-relro.patch deleted file mode 100644 index 92a79aec88e4..000000000000 --- a/sys-libs/efivar/files/efivar-37-ia64-relro.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://github.com/rhboot/efivar/pull/164 -https://bugs.gentoo.org/749963 - -From: Sergei Trofimovich <[email protected]> -Date: Mon, 19 Oct 2020 19:05:01 +0100 -Subject: [PATCH] gcc.specs: drop --fatal-warnings from linker options (ia64 - compatibility) - -``` -$ LANG=C make HOSTCC=x86_64-pc-linux-gnu-gcc CC=ia64-unknown-linux-gnu-gcc HOST_ARCH=ia64 -ia64-unknown-linux-gnu-gcc ... \ - -o libefivar.so ... -/usr/libexec/gcc/ia64-unknown-linux-gnu/ld: warning: -z relro ignored -collect2: error: ld returned 1 exit status -make[1]: *** [/home/slyfox/dev/git/efivar/src/include/rules.mk:32: libefivar.so] Error 1 -``` - -ia64 (and a few others) binutils target does not support '-z relro' and always -issues a warning. --fatal-warnings spec option turns the build into always failing one. - -The change drops `--fatal-warnings` options from gcc.spec entirely. - -Reported-by: Émeric Maschino -Bug: https://bugs.gentoo.org/749963 -Signed-off-by: Sergei Trofimovich <[email protected]> ---- a/gcc.specs -+++ b/gcc.specs -@@ -11,7 +11,7 @@ - + %(efivar_cpp_options) -Wmaybe-uninitialized -fno-merge-constants -fvisibility=hidden %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}} - - *self_spec: --+ %{!shared:%{!static:%{!r:-pie}}} %{static:-Wl,-no-fatal-warnings -Wl,-static -static -Wl,-z,relro,-z,now} -++ %{!shared:%{!static:%{!r:-pie}}} %{static:-Wl,-static -static -Wl,-z,relro,-z,now} - - *link: --+ %{!static:--fatal-warnings} --no-undefined-version --no-allow-shlib-undefined --add-needed -z now --build-id %{!static:%{!shared:-pie}} %{shared:-z relro} %{static:%<pie} -++ --no-undefined-version --no-allow-shlib-undefined --add-needed -z now --build-id %{!static:%{!shared:-pie}} %{shared:-z relro} %{static:%<pie}
