From 2f57d1e86732ff5160de52e92584363cc0e256cb Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 29 Apr 2022 07:08:10 +0100 Subject: sys-devel/make: rebase patch paths Allows patching gnulib. Closes: https://bugs.gentoo.org/809416 Signed-off-by: Sam James --- sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch | 4 ++-- sys-devel/make/files/make-4.2-default-cxx.patch | 6 ++---- sys-devel/make/make-4.3.ebuild | 6 ------ 3 files changed, 4 insertions(+), 12 deletions(-) (limited to 'sys-devel/make') diff --git a/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch b/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch index d2f60ec91cc0..743583b5a0a3 100644 --- a/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch +++ b/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch @@ -1,8 +1,8 @@ Fixed default libpatttern on Darwin, imported from prefix overlay. Got merged upstream: https://savannah.gnu.org/bugs/?37197 ---- a/default.c -+++ b/default.c +--- a/src/default.c ++++ b/src/default.c @@ -509,7 +509,11 @@ #ifdef __MSDOS__ ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a", diff --git a/sys-devel/make/files/make-4.2-default-cxx.patch b/sys-devel/make/files/make-4.2-default-cxx.patch index 4d592086a6ff..39e3ee0dd9f9 100644 --- a/sys-devel/make/files/make-4.2-default-cxx.patch +++ b/sys-devel/make/files/make-4.2-default-cxx.patch @@ -1,7 +1,5 @@ -diff --git a/default.c b/default.c -index 3d865c7..e8b3ed6 100644 ---- a/default.c -+++ b/default.c +--- a/src/default.c ++++ b/src/default.c @@ -530,7 +530,7 @@ static const char *default_variables[] = "OBJC", "gcc", #else diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild index 0abf4bf6c87e..50caf0365bb0 100644 --- a/sys-devel/make/make-4.3.ebuild +++ b/sys-devel/make/make-4.3.ebuild @@ -32,12 +32,6 @@ PATCHES=( "${FILESDIR}"/${PN}-4.2-default-cxx.patch ) -src_prepare() { - # sources were moved into src directory - cd src || die - default -} - src_configure() { use static && append-ldflags -static local myeconfargs=( -- cgit v1.2.3-65-gdbad