public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/yaboot/
Date: Wed, 14 Oct 2020 20:22:32 +0000 (UTC)	[thread overview]
Message-ID: <1602706927.e59f4f8b190152fe9ab5bbfdcc24ffe48838a3ae.mattst88@gentoo> (raw)

commit:     e59f4f8b190152fe9ab5bbfdcc24ffe48838a3ae
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 20:03:36 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 20:22:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e59f4f8b

sys-boot/yaboot: Depend on sys-apps/ibm-powerpc-utils

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 sys-boot/yaboot/yaboot-1.3.17-r4.ebuild | 117 ++++++++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)

diff --git a/sys-boot/yaboot/yaboot-1.3.17-r4.ebuild b/sys-boot/yaboot/yaboot-1.3.17-r4.ebuild
new file mode 100644
index 00000000000..28bd397e2aa
--- /dev/null
+++ b/sys-boot/yaboot/yaboot-1.3.17-r4.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+# yaboot is sensitive to external libc dependencies
+# of e2fsprogs. Pin to known working versions.
+# As a bonus we can control CFLAGS used to build e2fsprogs.
+# See compile_bundled_e2fsprogs() below and https://bugs.gentoo.org/641560
+E2FS_P="e2fsprogs-1.42.13"
+
+DESCRIPTION="PPC Bootloader"
+HOMEPAGE="http://yaboot.ozlabs.org"
+SRC_URI="
+	http://yaboot.ozlabs.org/releases/${P}.tar.gz
+	mirror://sourceforge/e2fsprogs/${E2FS_P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~ppc -ppc64"
+IUSE="ibm"
+
+DEPEND=""
+RDEPEND="
+	!sys-boot/yaboot-static
+	sys-apps/ibm-powerpc-utils
+	!ibm? (
+		sys-fs/hfsutils
+		sys-fs/hfsplusutils
+		sys-fs/mac-fdisk
+	)"
+
+PATCHES=(
+	# dual boot patch
+	"${FILESDIR}/yabootconfig-1.3.13.patch"
+	"${FILESDIR}/chrpfix.patch"
+	"${FILESDIR}/${P}-nopiessp-gcc4.patch"
+	"${FILESDIR}/${PN}-stubfuncs.patch"
+
+	# Fix the devspec path on newer kernels
+	"${FILESDIR}/new-ofpath-devspec.patch"
+)
+
+src_prepare() {
+	# has to be copied before 'new-ofpath-devspec'
+	cp "${FILESDIR}/new-ofpath" "${S}/ybin/ofpath" || die
+	default
+
+	pushd "${WORKDIR}/${E2FS_P}"
+	eapply "${FILESDIR}"/e2fsprogs-1.42.13-sysmacros.h.patch
+	popd
+
+	# No need to hardcode this path -- the compiler already knows to use it.
+	# Error only on real errors, for prom printing format compile failure.
+	sed -i \
+		-e 's:-I/usr/include::' \
+		-e 's:-Werror:-Wno-error:g' \
+		Makefile || die
+
+	# We'll install bundled libext2fs.a here
+	DEPS_DIR="${T}"/bundled-deps
+	export DEPS_DIR
+}
+
+src_configure() {
+	# ld.gold fails to link yaboot as:
+	#  sorry, I can't find space in second/yaboot.chrp to put the note
+	# bug #678710
+	tc-ld-disable-gold
+
+	pushd "${WORKDIR}/${E2FS_P}" || die
+	econf \
+		--enable-libblkid \
+		--enable-libuuid \
+		--disable-fsck \
+		--disable-quota
+	popd
+
+	default
+}
+
+src_compile() {
+	# Note: we use unmodified host's CFLAGS to build depends.
+	emake -C "${WORKDIR}/${E2FS_P}" V=1
+	# install-libs to install libext2fs.a for yaboot to statically link against
+	emake -C "${WORKDIR}/${E2FS_P}" DESTDIR="${DEPS_DIR}" install-libs V=1
+
+	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+	# -std=gnu90 is needed to preserve 'inline' semantics
+	# of pre-c99 (always-inline) to avoid duplicate symbol
+	# definition, bug #641560.
+	# -L${deps_prefix}/usr/lib is needed to inject known
+	# working libext2fs.a as yaboot bundles header overrides
+	# that assume matcking implementation. System's version
+	# frequently does not work like in bug #641560.
+	emake \
+		PREFIX=/usr \
+		MANDIR=share/man \
+		CC="$(tc-getCC) -std=gnu90" \
+		LD="$(tc-getLD) -L${DEPS_DIR}/usr/lib"
+}
+
+src_install() {
+	sed -i -e 's/\/local//' etc/yaboot.conf || die
+	emake \
+		ROOT="${D}" \
+		PREFIX=/usr \
+		MANDIR=share/man \
+		CC="$(tc-getCC) -std=gnu90" \
+		LD="$(tc-getLD) -L${DEPS_DIR}/usr/lib" \
+		\
+		install
+	mv "${ED}"/etc/yaboot.conf{,.sample} || die
+}


             reply	other threads:[~2020-10-14 20:22 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-14 20:22 Matt Turner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-10-14 20:22 [gentoo-commits] repo/gentoo:master commit in: sys-boot/yaboot/ Matt Turner
2019-05-26  8:51 Sergei Trofimovich
2016-05-08  5:19 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1602706927.e59f4f8b190152fe9ab5bbfdcc24ffe48838a3ae.mattst88@gentoo \
    --to=mattst88@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox