diff options
| author |   Michael Orlitzky <mjo@gentoo.org> | 2022-12-27 09:06:43 -0500 |
|---|---|---|
| committer | Michael Orlitzky <mjo@gentoo.org> | 2022-12-27 14:58:59 -0500 |
| commit | d98ddafb2aef042c7ac141b041e8bfebf915910f (patch) | |
| tree | e3139c3a9d47758c77cde291d481205f20ba6281 | |
| parent | virtual/perl-XSLoader: Stabilize 0.310.0 hppa, #865895 (diff) | |
| download | gentoo-d98ddafb2aef042c7ac141b041e8bfebf915910f.tar.gz gentoo-d98ddafb2aef042c7ac141b041e8bfebf915910f.tar.bz2 gentoo-d98ddafb2aef042c7ac141b041e8bfebf915910f.zip | |
dev-lang/R: attempt to fix the parallel install.
We have had an "emake -j1 ... install" in this ebuild for a long time,
but bug 883063 shows that -j1 only minimizes the risk of failure, and
does not completely eliminate it. I've tried to reproduce the failure
and have found a missing dependency in the upstream Makefile. This
commit adds a patch to fix it.
Now, we have one fewer build system bugs. I've removed the old -j1
workaround, and am marking bug 883063 as resolved so that future
installation failures are reported as new bugs: we need new reports to
let us know that the bug fixed in this commit was not the only one, if
that happens to be the case.
Closes: https://bugs.gentoo.org/883063
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
| -rw-r--r-- | dev-lang/R/R-4.2.2.ebuild | 3 | ||||
| -rw-r--r-- | dev-lang/R/files/R-4.2.2-parallel-rmath-h-install.patch | 23 |
2 files changed, 25 insertions, 1 deletions
diff --git a/dev-lang/R/R-4.2.2.ebuild b/dev-lang/R/R-4.2.2.ebuild index b1adfb0f9f9a..3d3cbf497f10 100644 --- a/dev-lang/R/R-4.2.2.ebuild +++ b/dev-lang/R/R-4.2.2.ebuild @@ -77,6 +77,7 @@ PATCHES=( "${FILESDIR}"/R-3.6.2-no-gzip-doc.patch "${FILESDIR}"/R-4.2.2-browser-pdf-prefs.patch "${FILESDIR}"/R-4.2.2-isspace-without-readline.patch + "${FILESDIR}/"R-4.2.2-parallel-rmath-h-install.patch ) pkg_pretend() { @@ -178,7 +179,7 @@ src_compile() { src_install() { default - emake -j1 -C src/nmath/standalone DESTDIR="${D}" install + emake -C src/nmath/standalone DESTDIR="${D}" install if use doc; then emake DESTDIR="${D}" install-info install-pdf diff --git a/dev-lang/R/files/R-4.2.2-parallel-rmath-h-install.patch b/dev-lang/R/files/R-4.2.2-parallel-rmath-h-install.patch new file mode 100644 index 000000000000..756ec8ff5428 --- /dev/null +++ b/dev-lang/R/files/R-4.2.2-parallel-rmath-h-install.patch @@ -0,0 +1,23 @@ +From ee1428e77095e52a7396fa7b455f63b7c5b9495b Mon Sep 17 00:00:00 2001 +From: kalibera <kalibera@00db46b3-68df-0310-9c12-caf00c1e9a41> +Date: Tue, 27 Dec 2022 11:21:33 +0000 +Subject: [PATCH] Declare dependency to ensure include dir exists (PR#17743). + +git-svn-id: https://svn.r-project.org/R/trunk@83504 00db46b3-68df-0310-9c12-caf00c1e9a41 +--- + src/nmath/standalone/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/nmath/standalone/Makefile.in b/src/nmath/standalone/Makefile.in +index 68b45006155..946795a0439 100644 +--- a/src/nmath/standalone/Makefile.in ++++ b/src/nmath/standalone/Makefile.in +@@ -151,7 +151,7 @@ install-strip: installdirs install-header install-pc + fi + @!(test -f libRmath.a) || $(SHELL) $(top_srcdir)/tools/copy-if-change libRmath.a $(DESTDIR)$(libdir)/libRmath.a + +-install-header: ++install-header: installdirs + @(cd ../../include; $(MAKE) Rmath.h) + @WANT_R_FRAMEWORK_FALSE@ @$(SHELL) $(top_srcdir)/tools/copy-if-change ../../include/Rmath.h $(DESTDIR)$(includedir)/Rmath.h + @WANT_R_FRAMEWORK_TRUE@ @$(SHELL) $(top_srcdir)/tools/copy-if-change ../../include/Rmath.h $(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/include/Rmath.h |