From 6cbe4c3ed96b51d68b37610dfc9605839736a0d7 Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Sat, 3 Dec 2022 14:27:24 +0100
Subject: sys-fs/hfsplusutils: add -fno-strict-aliasing to avoid LTO breakage

Closes: https://bugs.gentoo.org/863902
Signed-off-by: David Seifert <soap@gentoo.org>
---
 sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild | 48 -----------------------
 sys-fs/hfsplusutils/hfsplusutils-1.0.4-r3.ebuild | 49 ++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 48 deletions(-)
 delete mode 100644 sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
 create mode 100644 sys-fs/hfsplusutils/hfsplusutils-1.0.4-r3.ebuild

(limited to 'sys-fs/hfsplusutils')

diff --git a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
deleted file mode 100644
index 34c9cf508cba..000000000000
--- a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="hfsplus_${PV}"
-
-DESCRIPTION="HFS+ Filesystem Access Utilities (a PPC filesystem)"
-HOMEPAGE="http://penguinppc.org/historical/hfsplus/"
-SRC_URI="http://penguinppc.org/historical/hfsplus/${MY_P}.src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 x86"
-
-S="${WORKDIR}/hfsplus-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-glob.patch
-	"${FILESDIR}"/${P}-errno.patch
-	"${FILESDIR}"/${P}-gcc4.patch
-	"${FILESDIR}"/${P}-string.patch
-	"${FILESDIR}"/${P}-stdlib.patch
-	"${FILESDIR}"/${P}-cflags.patch
-	"${FILESDIR}"/${P}-fno-common-gcc10.patch
-	"${FILESDIR}"/${P}-gcc5.patch
-)
-
-src_prepare() {
-	default
-
-	# let's avoid the Makefile.cvs since isn't working for us
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	newman doc/man/hfsp.man hfsp.1
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r3.ebuild b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r3.ebuild
new file mode 100644
index 000000000000..efffe757f332
--- /dev/null
+++ b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+MY_P="hfsplus_${PV}"
+
+DESCRIPTION="HFS+ Filesystem Access Utilities (a PPC filesystem)"
+HOMEPAGE="http://penguinppc.org/historical/hfsplus/"
+SRC_URI="http://penguinppc.org/historical/hfsplus/${MY_P}.src.tar.bz2"
+S="${WORKDIR}/hfsplus-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc ppc64 x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-glob.patch
+	"${FILESDIR}"/${P}-errno.patch
+	"${FILESDIR}"/${P}-gcc4.patch
+	"${FILESDIR}"/${P}-string.patch
+	"${FILESDIR}"/${P}-stdlib.patch
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-fno-common-gcc10.patch
+	"${FILESDIR}"/${P}-gcc5.patch
+)
+
+src_prepare() {
+	default
+
+	# let's avoid the Makefile.cvs since it isn't working for us
+	eautoreconf
+}
+
+src_configure() {
+	# brittle codebase with lots of type punning, breaks LTO (#863902)
+	append-cflags -fno-strict-aliasing
+
+	default
+}
+
+src_install() {
+	default
+	newman doc/man/hfsp.man hfsp.1
+
+	find "${ED}" -name '*.la' -delete || die
+}
-- 
cgit v1.2.3