| 1 |
commit: 567c5bc07e771ba1d236510cd9ada578700b61c3 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 5 08:31:24 2020 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 5 08:31:40 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=567c5bc0 |
| 7 |
|
| 8 |
media-sound/lilypond: fixed hardcoded ar command |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/734176 |
| 11 |
Package-Manager: Portage-3.0.5, Repoman-3.0.1 |
| 12 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 13 |
|
| 14 |
media-sound/lilypond/lilypond-2.21.1-r1.ebuild | 7 +++++-- |
| 15 |
media-sound/lilypond/lilypond-2.21.4-r1.ebuild | 7 +++++-- |
| 16 |
media-sound/lilypond/lilypond-9999.ebuild | 7 +++++-- |
| 17 |
3 files changed, 15 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-sound/lilypond/lilypond-2.21.1-r1.ebuild b/media-sound/lilypond/lilypond-2.21.1-r1.ebuild |
| 20 |
index 521872ddafb..ac757af28f2 100644 |
| 21 |
--- a/media-sound/lilypond/lilypond-2.21.1-r1.ebuild |
| 22 |
+++ b/media-sound/lilypond/lilypond-2.21.1-r1.ebuild |
| 23 |
@@ -79,9 +79,11 @@ src_prepare() { |
| 24 |
} |
| 25 |
|
| 26 |
src_configure() { |
| 27 |
+ # fix hardcoded `ar` |
| 28 |
+ sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command" |
| 29 |
+ |
| 30 |
# documentation generation currently not supported since it requires a newer |
| 31 |
# version of texi2html than is currently in the tree |
| 32 |
- |
| 33 |
local myeconfargs=( |
| 34 |
--with-texgyre-dir=/usr/share/fonts/tex-gyre |
| 35 |
--disable-documentation |
| 36 |
@@ -90,9 +92,10 @@ src_configure() { |
| 37 |
$(use_enable debug debugging) |
| 38 |
$(use_enable profile profiling) |
| 39 |
) |
| 40 |
+ |
| 41 |
export VARTEXFONTS="${T}/fonts" # https://bugs.gentoo.org/692010 |
| 42 |
|
| 43 |
- econf "${myeconfargs[@]}" |
| 44 |
+ econf "${myeconfargs[@]}" AR="$(tc-getAR)" |
| 45 |
} |
| 46 |
|
| 47 |
src_compile() { |
| 48 |
|
| 49 |
diff --git a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild |
| 50 |
index 0196e4c7d4d..5fb8dcb93de 100644 |
| 51 |
--- a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild |
| 52 |
+++ b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild |
| 53 |
@@ -79,9 +79,11 @@ src_prepare() { |
| 54 |
} |
| 55 |
|
| 56 |
src_configure() { |
| 57 |
+ # fix hardcoded `ar` |
| 58 |
+ sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command" |
| 59 |
+ |
| 60 |
# documentation generation currently not supported since it requires a newer |
| 61 |
# version of texi2html than is currently in the tree |
| 62 |
- |
| 63 |
local myeconfargs=( |
| 64 |
--with-texgyre-dir=/usr/share/fonts/tex-gyre |
| 65 |
--disable-documentation |
| 66 |
@@ -90,9 +92,10 @@ src_configure() { |
| 67 |
$(use_enable debug debugging) |
| 68 |
$(use_enable profile profiling) |
| 69 |
) |
| 70 |
+ |
| 71 |
export VARTEXFONTS="${T}/fonts" # https://bugs.gentoo.org/692010 |
| 72 |
|
| 73 |
- econf "${myeconfargs[@]}" |
| 74 |
+ econf "${myeconfargs[@]}" AR="$(tc-getAR)" |
| 75 |
} |
| 76 |
|
| 77 |
src_compile() { |
| 78 |
|
| 79 |
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild |
| 80 |
index fc14ef8ed34..ffa9b40c076 100644 |
| 81 |
--- a/media-sound/lilypond/lilypond-9999.ebuild |
| 82 |
+++ b/media-sound/lilypond/lilypond-9999.ebuild |
| 83 |
@@ -78,9 +78,11 @@ src_prepare() { |
| 84 |
} |
| 85 |
|
| 86 |
src_configure() { |
| 87 |
+ # fix hardcoded `ar` |
| 88 |
+ sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command" |
| 89 |
+ |
| 90 |
# documentation generation currently not supported since it requires a newer |
| 91 |
# version of texi2html than is currently in the tree |
| 92 |
- |
| 93 |
local myeconfargs=( |
| 94 |
--with-texgyre-dir=/usr/share/fonts/tex-gyre |
| 95 |
--disable-documentation |
| 96 |
@@ -89,9 +91,10 @@ src_configure() { |
| 97 |
$(use_enable debug debugging) |
| 98 |
$(use_enable profile profiling) |
| 99 |
) |
| 100 |
+ |
| 101 |
export VARTEXFONTS="${T}/fonts" # https://bugs.gentoo.org/692010 |
| 102 |
|
| 103 |
- econf "${myeconfargs[@]}" |
| 104 |
+ econf "${myeconfargs[@]}" AR="$(tc-getAR)" |
| 105 |
} |
| 106 |
|
| 107 |
src_compile() { |
Archives