commit: 797977a54c63876d010635d5d8431798396e9b15 Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> AuthorDate: Sun Sep 10 12:29:17 2023 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Thu Sep 14 04:39:01 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=797977a5
sys-boot/refind: fix compilation with clang Compiling with clang works. Linking with lld produces broken executables (including the drivers). llvm-objcopy does not support the output format needed by refind. Try to force ld.bfd and binutils objcopy. Fail otherwise. Bug: https://bugs.gentoo.org/732256 Bug: https://bugs.gentoo.org/832018 Bug: https://bugs.gentoo.org/881131 Closes: https://github.com/gentoo/gentoo/pull/32710 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> sys-boot/refind/files/refind-0.14.0.2-clang.patch | 62 +++++++++ sys-boot/refind/refind-0.14.0.2-r1.ebuild | 160 ++++++++++++++++++++++ 2 files changed, 222 insertions(+) diff --git a/sys-boot/refind/files/refind-0.14.0.2-clang.patch b/sys-boot/refind/files/refind-0.14.0.2-clang.patch new file mode 100644 index 000000000000..fe2323390355 --- /dev/null +++ b/sys-boot/refind/files/refind-0.14.0.2-clang.patch @@ -0,0 +1,62 @@ +Fix compilation with clang. + +Clang does not support nested functions (a gcc extension), so move it outside. + +Compiling with _FORTIFY_SOURCE and -ffreestanding results in +nanojpeg.c:(.text+0xa28): undefined reference to `__memset_chk' + +See also: https://bugs.gentoo.org/881131 + +--- a/filesystems/crc32c.c ++++ b/filesystems/crc32c.c +@@ -22,25 +22,24 @@ + + static uint32_t crc32c_table [256]; + +-static void +-init_crc32c_table (void) ++uint32_t reflect (uint32_t ref, int len) + { +- auto uint32_t reflect (uint32_t ref, int len); +- uint32_t reflect (uint32_t ref, int len) +- { +- uint32_t result = 0; +- int i; ++ uint32_t result = 0; ++ int i; + +- for (i = 1; i <= len; i++) +- { +- if (ref & 1) +- result |= 1 << (len - i); +- ref >>= 1; +- } +- +- return result; ++ for (i = 1; i <= len; i++) ++ { ++ if (ref & 1) ++ result |= 1 << (len - i); ++ ref >>= 1; + } + ++ return result; ++} ++ ++static void ++init_crc32c_table (void) ++{ + static int crc32c_table_inited; + if(crc32c_table_inited) + return; +--- a/libeg/nanojpeg.c ++++ b/libeg/nanojpeg.c +@@ -112,6 +112,8 @@ + #ifndef _NANOJPEG_H + #define _NANOJPEG_H + ++#undef _FORTIFY_SOURCE ++ + // Modified: Map libc-style free() and malloc() to their EFI equivalents.... + #define free MyFreePool + #define malloc AllocatePool diff --git a/sys-boot/refind/refind-0.14.0.2-r1.ebuild b/sys-boot/refind/refind-0.14.0.2-r1.ebuild new file mode 100644 index 000000000000..c7dad8ce3707 --- /dev/null +++ b/sys-boot/refind/refind-0.14.0.2-r1.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature secureboot toolchain-funcs + +DESCRIPTION="The UEFI Boot Manager by Rod Smith" +HOMEPAGE="https://www.rodsbooks.com/refind/"; +SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz" + +LICENSE="BSD GPL-2 GPL-3 FDL-1.3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs" +IUSE="${FS_USE} doc" + +DEPEND="sys-boot/gnu-efi" + +# for ld.bfd and objcopy +BDEPEND="sys-devel/binutils" + +DOCS=( README.txt NEWS.txt ) + +PATCHES=( "${FILESDIR}"/${P}-clang.patch ) + +checktools() { + if [[ ${MERGE_TYPE} != "binary" ]]; then + # bug #832018 + tc-export LD + tc-ld-force-bfd + # the makefile calls LD directly, so try to fix LD too + LD="${LD/.lld/.bfd}" + tc-ld-is-lld "${LD}" && die "Linking with lld produces broken executables and may lead to unbootable system" + + # bug #732256 + # llvm-objcopy does not support EFI target, try to use binutils objcopy or fail + tc-export OBJCOPY + OBJCOPY="${OBJCOPY/llvm-/}" + LANG=C LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' || die "${OBJCOPY} (objcopy) does not support EFI target" + fi +} + +pkg_pretend() { + checktools +} + +pkg_setup() { + if use x86; then + export EFIARCH=ia32 + export BUILDARCH=ia32 + elif use amd64; then + export EFIARCH=x64 + export BUILDARCH=x86_64 + fi + secureboot_pkg_setup + + # this does not only check, but also exports LD and OBJCOPY + checktools +} + +src_prepare() { + default + + # bug #598647 - PIE not supported + sed -e '/^CFLAGS/s/$/ -fno-PIE/' -i Make.common || die + sed -e '1 i\.NOTPARALLEL:' -i filesystems/Makefile || die + + # bug #881131, bug #832018 + sed -e 's/-fno-tree-loop-distribute-patterns/-ffreestanding/' -i Make.common || die + + cp "${FILESDIR}"/refind-sbat-gentoo-${PV}.csv refind-sbat-gentoo.csv || die +} + +src_compile() { + # Update fs targets depending on uses + local fs fs_names=() + for fs in ${FS_USE}; do + fs=${fs#+} + if use "${fs}"; then + fs_names+=( ${fs} ) + fi + done + fs_names=( "${fs_names[@]/%/_gnuefi}" ) + + # Prepare flags + local make_flags=( + ARCH="${BUILDARCH}" + CC="$(tc-getCC)" + AS="$(tc-getAS)" + LD="${LD}" + AR="$(tc-getAR)" + RANLIB="$(tc-getRANLIB)" + OBJCOPY="${OBJCOPY}" + GNUEFILIB="${ESYSROOT}/usr/$(get_libdir)" + EFILIB="${ESYSROOT}/usr/$(get_libdir)" + EFICRT0="${ESYSROOT}/usr/$(get_libdir)" + FILESYSTEMS="${fs_names[*]}" + FILESYSTEMS_GNUEFI="${fs_names[*]}" + REFIND_SBAT_CSV=refind-sbat-gentoo.csv + ) + + emake "${make_flags[@]}" all_gnuefi +} + +src_install() { + exeinto "/usr/$(get_libdir)/${PN}" + doexe refind-install + dosym -r "/usr/$(get_libdir)/${PN}/refind-install" "/usr/sbin/refind-install" + + doman "docs/man/"* + use doc && DOCS+=( docs/refind docs/Styles ) + einstalldocs + + insinto "/usr/$(get_libdir)/${PN}/refind" + doins "refind/refind_${EFIARCH}.efi" + doins "refind.conf-sample" + doins -r images icons fonts banners + + if [[ -d "drivers_${EFIARCH}" ]]; then + doins -r "drivers_${EFIARCH}" + fi + + insinto "/usr/$(get_libdir)/${PN}/refind/tools_${EFIARCH}" + doins "gptsync/gptsync_${EFIARCH}.efi" + + insinto "/etc/refind.d" + doins -r "keys" + + dosbin "mkrlconf" + dosbin "mvrefind" + dosbin "refind-mkdefault" + + secureboot_auto_sign --in-place +} + +pkg_postinst() { + elog "rEFInd has been built and installed into ${EROOT}/usr/$(get_libdir)/${PN}" + elog "You will need to use the command 'refind-install' to install" + elog "the binaries into your EFI System Partition" + + optfeature_header "refind-install requires additional packages to be fully functional:" + optfeature "binary signing for use with SecureBoot" app-crypt/sbsigntools + optfeature "writing to NVRAM" sys-boot/efibootmgr + optfeature "ESP management" sys-apps/gptfdisk + elog "" + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "A sample configuration can be found at" + elog "${EROOT}/usr/$(get_libdir)/${PN}/refind/refind.conf-sample" + else + if ver_test "${REPLACING_VERSIONS}" -lt "0.12.0"; then + ewarn "This new version uses sys-apps/gptfdisk instead of sys-block/parted" + ewarn "to manage ESP" + ewarn "" + fi + ewarn "Note that this installation will not update any EFI binaries" + ewarn "on your EFI System Partition - this needs to be done manually" + fi +}
