commit: 567c5bc07e771ba1d236510cd9ada578700b61c3 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Sat Sep 5 08:31:24 2020 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sat Sep 5 08:31:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=567c5bc0
media-sound/lilypond: fixed hardcoded ar command Closes: https://bugs.gentoo.org/734176 Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-sound/lilypond/lilypond-2.21.1-r1.ebuild | 7 +++++-- media-sound/lilypond/lilypond-2.21.4-r1.ebuild | 7 +++++-- media-sound/lilypond/lilypond-9999.ebuild | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/media-sound/lilypond/lilypond-2.21.1-r1.ebuild b/media-sound/lilypond/lilypond-2.21.1-r1.ebuild index 521872ddafb..ac757af28f2 100644 --- a/media-sound/lilypond/lilypond-2.21.1-r1.ebuild +++ b/media-sound/lilypond/lilypond-2.21.1-r1.ebuild @@ -79,9 +79,11 @@ src_prepare() { } src_configure() { + # fix hardcoded `ar` + sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command" + # documentation generation currently not supported since it requires a newer # version of texi2html than is currently in the tree - local myeconfargs=( --with-texgyre-dir=/usr/share/fonts/tex-gyre --disable-documentation @@ -90,9 +92,10 @@ src_configure() { $(use_enable debug debugging) $(use_enable profile profiling) ) + export VARTEXFONTS="${T}/fonts" # https://bugs.gentoo.org/692010 - econf "${myeconfargs[@]}" + econf "${myeconfargs[@]}" AR="$(tc-getAR)" } src_compile() { diff --git a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild index 0196e4c7d4d..5fb8dcb93de 100644 --- a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild +++ b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild @@ -79,9 +79,11 @@ src_prepare() { } src_configure() { + # fix hardcoded `ar` + sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command" + # documentation generation currently not supported since it requires a newer # version of texi2html than is currently in the tree - local myeconfargs=( --with-texgyre-dir=/usr/share/fonts/tex-gyre --disable-documentation @@ -90,9 +92,10 @@ src_configure() { $(use_enable debug debugging) $(use_enable profile profiling) ) + export VARTEXFONTS="${T}/fonts" # https://bugs.gentoo.org/692010 - econf "${myeconfargs[@]}" + econf "${myeconfargs[@]}" AR="$(tc-getAR)" } src_compile() { diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild index fc14ef8ed34..ffa9b40c076 100644 --- a/media-sound/lilypond/lilypond-9999.ebuild +++ b/media-sound/lilypond/lilypond-9999.ebuild @@ -78,9 +78,11 @@ src_prepare() { } src_configure() { + # fix hardcoded `ar` + sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command" + # documentation generation currently not supported since it requires a newer # version of texi2html than is currently in the tree - local myeconfargs=( --with-texgyre-dir=/usr/share/fonts/tex-gyre --disable-documentation @@ -89,9 +91,10 @@ src_configure() { $(use_enable debug debugging) $(use_enable profile profiling) ) + export VARTEXFONTS="${T}/fonts" # https://bugs.gentoo.org/692010 - econf "${myeconfargs[@]}" + econf "${myeconfargs[@]}" AR="$(tc-getAR)" } src_compile() {
