diff options
| author |   Mark Wright <gienah@gentoo.org> | 2020-01-14 00:14:07 +1100 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2020-01-14 00:14:07 +1100 |
| commit | c9dc8c0bd3f814e3abc913d07fb0935a78797258 (patch) | |
| tree | c5a2e9482fe61385f2ed58c410cb6dac6b74725d /dev-lang/R/files | |
| parent | dev-libs/criterion: add snapshot (diff) | |
| download | gentoo-c9dc8c0bd3f814e3abc913d07fb0935a78797258.tar.gz gentoo-c9dc8c0bd3f814e3abc913d07fb0935a78797258.tar.bz2 gentoo-c9dc8c0bd3f814e3abc913d07fb0935a78797258.zip | |
dev-lang/R: Bump to 3.6.2
Thanks to Neil for reporting, UlvHare for testing bug #702808.
Fix bug #515428 pkg-config files with wrong LDFLAGS detected,
thanks to patrick for reporting.
Closes: https://bugs.gentoo.org/show_bug.cgi?id=702808
Closes: https://bugs.gentoo.org/show_bug.cgi?id=515428
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mark Wright <gienah@gentoo.org>
Diffstat (limited to 'dev-lang/R/files')
| -rw-r--r-- | dev-lang/R/files/R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch | 11 | ||||
| -rw-r--r-- | dev-lang/R/files/R-3.6.2-no-gzip-doc.patch | 10 |
2 files changed, 21 insertions, 0 deletions
diff --git a/dev-lang/R/files/R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch b/dev-lang/R/files/R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch new file mode 100644 index 000000000000..2bcf50ccadb2 --- /dev/null +++ b/dev-lang/R/files/R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch @@ -0,0 +1,11 @@ +--- R-3.6.2-orig/src/unix/Makefile.in 2019-03-29 10:02:31.000000000 +1100 ++++ R-3.6.2/src/unix/Makefile.in 2020-01-13 22:39:14.506804106 +1100 +@@ -79,7 +79,7 @@ + -e "s:@rincludedir:$(rincludedir):" \ + -e "s:@rarch:$(R_ARCH):" \ + -e 's:@libsprivate:$(STATIC_LIBR_PC):' \ +- -e 's:@others:$(MAIN_LDFLAGS) $(LDFLAGS):' \ ++ -e 's:@others:$(MAIN_LDFLAGS):' \ + -e 's/@VERSION/$(VERSION)/' $(srcdir)/libR.pc.in \ + > "$(DESTDIR)$(libdir)/pkgconfig/libR.pc" + diff --git a/dev-lang/R/files/R-3.6.2-no-gzip-doc.patch b/dev-lang/R/files/R-3.6.2-no-gzip-doc.patch new file mode 100644 index 000000000000..c87b61780529 --- /dev/null +++ b/dev-lang/R/files/R-3.6.2-no-gzip-doc.patch @@ -0,0 +1,10 @@ +--- R-3.6.2-orig/doc/manual/Makefile.in 2019-03-29 10:02:40.000000000 +1100 ++++ R-3.6.2/doc/manual/Makefile.in 2020-01-13 22:17:31.324967094 +1100 +@@ -345,7 +345,6 @@ + @$(ECHO) "installing R info pages ..." + @for f in $(OBJECTS_INFO:.info=.info*); do \ + $(INSTALL_DATA) $${f} "$(DESTDIR)$(infodir)"; \ +- $(R_GZIPCMD) -f "$(DESTDIR)$(infodir)/$${f}"; \ + done + @$(ECHO) "updating '$(infodir)/dir' ..." + @for f in $(OBJECTS_INFO); do \ |