commit: 7a1379aaf6851999446e5a06e196a8956649f9f6 Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Sat Aug 19 16:18:20 2023 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Sat Aug 19 16:24:13 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a1379aa
sys-apps/gptfdisk: remove hard-coded upstream optimisation flags Closes: https://bugs.gentoo.org/911855 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> .../files/gptfdisk-1.0.9-build_flags.patch | 11 ++++ sys-apps/gptfdisk/gptfdisk-1.0.9-r3.ebuild | 63 ++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.9-build_flags.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-build_flags.patch new file mode 100644 index 000000000000..2f92d77f3855 --- /dev/null +++ b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-build_flags.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -66,7 +66,7 @@ + # Default/Linux settings.... + STRIP?=strip + #CXXFLAGS+=-O2 -Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16 +-CXXFLAGS+=-O2 -Wall -D_FILE_OFFSET_BITS=64 ++CXXFLAGS+=-D_FILE_OFFSET_BITS=64 + LDFLAGS+= + LDLIBS+=-luuid #-licuio -licuuc + FATBINFLAGS= diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.9-r3.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.9-r3.ebuild new file mode 100644 index 000000000000..9656c9322eb5 --- /dev/null +++ b/sys-apps/gptfdisk/gptfdisk-1.0.9-r3.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="GPT partition table manipulator for Linux" +HOMEPAGE="https://www.rodsbooks.com/gdisk/"; +SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="ncurses static" + +# libuuid from util-linux is required. +RDEPEND="!static? ( + dev-libs/popt + ncurses? ( sys-libs/ncurses:=[unicode(+)] ) + kernel_linux? ( sys-apps/util-linux ) + )" +DEPEND=" + ${RDEPEND} + static? ( + dev-libs/popt[static-libs(+)] + ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] ) + kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) + ) + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${PN}-1.0.9-libuuid.patch" #844073 + "${FILESDIR}/${PN}-1.0.9-popt_segv.patch" #872131 + "${FILESDIR}"/${PN}-1.0.9-build_flags.patch + "${FILESDIR}"/${PN}-1.0.9-musl-1.2.4.patch +) + +src_prepare() { + default + + tc-export CXX PKG_CONFIG + + if ! use ncurses ; then + sed -i \ + -e '/^all:/s: cgdisk::' \ + Makefile || die + fi + + sed \ + -e '/g++/s:=:?=:g' \ + -e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \ + -i Makefile || die + + use static && append-ldflags -static +} + +src_install() { + dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts + doman *.8 + dodoc NEWS README +}
