| 1 |
commit: 2f57d1e86732ff5160de52e92584363cc0e256cb |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 29 06:08:10 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 29 06:12:46 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f57d1e8 |
| 7 |
|
| 8 |
sys-devel/make: rebase patch paths |
| 9 |
|
| 10 |
Allows patching gnulib. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/809416 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch | 4 ++-- |
| 16 |
sys-devel/make/files/make-4.2-default-cxx.patch | 6 ++---- |
| 17 |
sys-devel/make/make-4.3.ebuild | 6 ------ |
| 18 |
3 files changed, 4 insertions(+), 12 deletions(-) |
| 19 |
|
| 20 |
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 |
| 21 |
index d2f60ec91cc0..743583b5a0a3 100644 |
| 22 |
--- a/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch |
| 23 |
+++ b/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch |
| 24 |
@@ -1,8 +1,8 @@ |
| 25 |
Fixed default libpatttern on Darwin, imported from prefix overlay. |
| 26 |
Got merged upstream: |
| 27 |
https://savannah.gnu.org/bugs/?37197 |
| 28 |
---- a/default.c |
| 29 |
-+++ b/default.c |
| 30 |
+--- a/src/default.c |
| 31 |
++++ b/src/default.c |
| 32 |
@@ -509,7 +509,11 @@ |
| 33 |
#ifdef __MSDOS__ |
| 34 |
".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a", |
| 35 |
|
| 36 |
diff --git a/sys-devel/make/files/make-4.2-default-cxx.patch b/sys-devel/make/files/make-4.2-default-cxx.patch |
| 37 |
index 4d592086a6ff..39e3ee0dd9f9 100644 |
| 38 |
--- a/sys-devel/make/files/make-4.2-default-cxx.patch |
| 39 |
+++ b/sys-devel/make/files/make-4.2-default-cxx.patch |
| 40 |
@@ -1,7 +1,5 @@ |
| 41 |
-diff --git a/default.c b/default.c |
| 42 |
-index 3d865c7..e8b3ed6 100644 |
| 43 |
---- a/default.c |
| 44 |
-+++ b/default.c |
| 45 |
+--- a/src/default.c |
| 46 |
++++ b/src/default.c |
| 47 |
@@ -530,7 +530,7 @@ static const char *default_variables[] = |
| 48 |
"OBJC", "gcc", |
| 49 |
#else |
| 50 |
|
| 51 |
diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild |
| 52 |
index 0abf4bf6c87e..50caf0365bb0 100644 |
| 53 |
--- a/sys-devel/make/make-4.3.ebuild |
| 54 |
+++ b/sys-devel/make/make-4.3.ebuild |
| 55 |
@@ -32,12 +32,6 @@ PATCHES=( |
| 56 |
"${FILESDIR}"/${PN}-4.2-default-cxx.patch |
| 57 |
) |
| 58 |
|
| 59 |
-src_prepare() { |
| 60 |
- # sources were moved into src directory |
| 61 |
- cd src || die |
| 62 |
- default |
| 63 |
-} |
| 64 |
- |
| 65 |
src_configure() { |
| 66 |
use static && append-ldflags -static |
| 67 |
local myeconfargs=( |
Archives