commit: 55963a3f7ff33af3182040c076132590fc9be166 Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de> AuthorDate: Sat Oct 10 14:34:30 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Wed Nov 25 08:16:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55963a3f
sci-geosciences/grass: fix build failure Fix build failure during highly parallel build. Closes: https://bugs.gentoo.org/746590 Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de> Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> sci-geosciences/grass/files/grass-7.8-flock.patch | 17 +++++++++++++++++ sci-geosciences/grass/grass-7.8.3.ebuild | 5 +++++ 2 files changed, 22 insertions(+) diff --git a/sci-geosciences/grass/files/grass-7.8-flock.patch b/sci-geosciences/grass/files/grass-7.8-flock.patch new file mode 100644 index 00000000000..4070f228dbb --- /dev/null +++ b/sci-geosciences/grass/files/grass-7.8-flock.patch @@ -0,0 +1,17 @@ +diff -Naur grass-7.8.3.org/include/Make/HtmlRules.make grass-7.8.3/include/Make/HtmlRules.make +--- grass-7.8.3.org/include/Make/HtmlRules.make 2020-05-05 10:51:50.000000000 +0200 ++++ grass-7.8.3/include/Make/HtmlRules.make 2020-10-10 13:43:42.800880621 +0200 +@@ -11,10 +11,10 @@ + endif + + $(HTMLDIR)/%.png: %.png | $(HTMLDIR) +- $(INSTALL_DATA) $< $@ ++ flock $@ $(INSTALL_DATA) $< $@ + + $(HTMLDIR)/%.jpg: %.jpg | $(HTMLDIR) +- $(INSTALL_DATA) $< $@ ++ flock $@ $(INSTALL_DATA) $< $@ + + $(HTMLDIR)/%.gif: %.gif | $(HTMLDIR) +- $(INSTALL_DATA) $< $@ ++ flock $@ $(INSTALL_DATA) $< $@ diff --git a/sci-geosciences/grass/grass-7.8.3.ebuild b/sci-geosciences/grass/grass-7.8.3.ebuild index ab8ab4cf98a..e8911d37392 100644 --- a/sci-geosciences/grass/grass-7.8.3.ebuild +++ b/sci-geosciences/grass/grass-7.8.3.ebuild @@ -79,6 +79,11 @@ BDEPEND=" S="${WORKDIR}/${MY_P}" +PATCHES=( + # bug 746590 + "${FILESDIR}/${PN}-7.8-flock.patch" +) + pkg_setup() { if use lapack; then local mylapack=$(eselect lapack show)
