| 1 |
commit: b80d8ef5ee97c9e9400007fca285566a2fc74a16 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 13 22:01:57 2019 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 13 22:02:06 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b80d8ef5 |
| 7 |
|
| 8 |
app-misc/bb: unbreak m4 handling |
| 9 |
|
| 10 |
Fix 'm4-stuff.patch' to restore m4/ directory. |
| 11 |
Was broken by upgrade to EAPI=7. Instead of failing |
| 12 |
patch dumped files into root directory instead of m4/. |
| 13 |
|
| 14 |
Reported-by: Gabriele Pelissetto |
| 15 |
Closes: https://bugs.gentoo.org/699826 |
| 16 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
| 17 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 18 |
|
| 19 |
app-misc/bb/bb-1.3.0_rc1-r5.ebuild | 3 ++- |
| 20 |
app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch | 4 ++-- |
| 21 |
2 files changed, 4 insertions(+), 3 deletions(-) |
| 22 |
|
| 23 |
diff --git a/app-misc/bb/bb-1.3.0_rc1-r5.ebuild b/app-misc/bb/bb-1.3.0_rc1-r5.ebuild |
| 24 |
index 793a64d7de5..23d546b2831 100644 |
| 25 |
--- a/app-misc/bb/bb-1.3.0_rc1-r5.ebuild |
| 26 |
+++ b/app-misc/bb/bb-1.3.0_rc1-r5.ebuild |
| 27 |
@@ -63,7 +63,8 @@ src_prepare() { |
| 28 |
-i Makefile.am || die |
| 29 |
|
| 30 |
mv -v configure.{in,ac} || die |
| 31 |
- eautoreconf |
| 32 |
+ # m4/ dir is added with 'm4-stuff.patch' patch |
| 33 |
+ AT_M4DIR="m4" eautoreconf |
| 34 |
} |
| 35 |
|
| 36 |
pkg_postinst() { |
| 37 |
|
| 38 |
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch b/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch |
| 39 |
index 843d839908f..12d9276aeb6 100644 |
| 40 |
--- a/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch |
| 41 |
+++ b/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch |
| 42 |
@@ -7,7 +7,7 @@ Date: Tue Feb 7 10:59:09 2012 +0300 |
| 43 |
bb-1.3.0_rc1: bundle m4 source |
| 44 |
|
| 45 |
--- /dev/null |
| 46 |
-+++ m4/aalib.m4 |
| 47 |
++++ a/m4/aalib.m4 |
| 48 |
@@ -0,0 +1,169 @@ |
| 49 |
+# Configure paths for AALIB |
| 50 |
+# Jan Hubicka 4/22/2001 |
| 51 |
@@ -179,7 +179,7 @@ Date: Tue Feb 7 10:59:09 2012 +0300 |
| 52 |
+ rm -f conf.aalibtest |
| 53 |
+]) |
| 54 |
--- /dev/null |
| 55 |
-+++ m4/libmikmod.m4 |
| 56 |
++++ a/m4/libmikmod.m4 |
| 57 |
@@ -0,0 +1,207 @@ |
| 58 |
+# Configure paths for libmikmod |
| 59 |
+# |
Archives