From 2861b43fa9fdf0f2dfff1508647e5eae87f84d8d Mon Sep 17 00:00:00 2001 From: Joe Kappus Date: Fri, 14 Apr 2023 15:34:03 -0400 Subject: [PATCH] app-arch/p7zip: fix natspec patch due to how we handle makefiles need to drop that part from patch and update the makefiles directly in ebuild. fixes build with natspec. Closes: https://bugs.gentoo.org/904332 Signed-off-by: Joe Kappus Closes: https://github.com/gentoo/gentoo/pull/30597 Signed-off-by: Sam James --- app-arch/p7zip/files/p7zip-17.05-natspec.patch | 13 ------------- app-arch/p7zip/p7zip-17.05-r1.ebuild | 5 ++++- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/app-arch/p7zip/files/p7zip-17.05-natspec.patch b/app-arch/p7zip/files/p7zip-17.05-natspec.patch index 45f24559a4c81..7487924af3061 100644 --- a/app-arch/p7zip/files/p7zip-17.05-natspec.patch +++ b/app-arch/p7zip/files/p7zip-17.05-natspec.patch @@ -115,16 +115,3 @@ index 353e895..44071f3 100644 if (isUtf8) if (ConvertUTF8ToUnicode(s, res) || ignore_Utf8_Errors) return; -diff --git a/makefile.machine b/makefile.machine -index a89b568..3e12592 100644 ---- a/makefile.machine -+++ b/makefile.machine -@@ -16,7 +16,7 @@ CC=gcc - CC_SHARED=-fPIC - LINK_SHARED=-fPIC -shared - --LOCAL_LIBS=-lpthread -+LOCAL_LIBS=-lpthread -lnatspec - LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl - - OBJ_CRC32=$(OBJ_CRC32_C) diff --git a/app-arch/p7zip/p7zip-17.05-r1.ebuild b/app-arch/p7zip/p7zip-17.05-r1.ebuild index dbb6ca8a35674..f07d678263c85 100644 --- a/app-arch/p7zip/p7zip-17.05-r1.ebuild +++ b/app-arch/p7zip/p7zip-17.05-r1.ebuild @@ -25,7 +25,10 @@ BDEPEND=" src_prepare() { default - use natspec && eapply "${FILESDIR}"/${P}-natspec.patch + if use natspec; then + eapply "${FILESDIR}"/${P}-natspec.patch + sed -i '/^LOCAL_LIBS/s/$/ -lnatspec/' makefile.* || die + fi if ! use pch; then sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die