~ruther/guix-local

167a05aabc229d48d62545ef218d8b0577e6e8f3 — Ludovic Courtès 11 years ago 4e9f592
gnu: gcc-5.1: Add specific libvtv patch.

* gnu/packages/patches/gcc-5.0-libvtv-runpath.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/gcc.scm (gcc-5.1)[source]: Use it.
3 files changed, 19 insertions(+), 1 deletions(-)

M gnu-system.am
M gnu/packages/gcc.scm
A gnu/packages/patches/gcc-5.0-libvtv-runpath.patch
M gnu-system.am => gnu-system.am +1 -0
@@ 422,6 422,7 @@ dist_patch_DATA =						\
  gnu/packages/patches/gcc-arm-link-spec-fix.patch		\
  gnu/packages/patches/gcc-cross-environment-variables.patch	\
  gnu/packages/patches/gcc-libvtv-runpath.patch			\
  gnu/packages/patches/gcc-5.0-libvtv-runpath.patch		\
  gnu/packages/patches/geoclue-config.patch			\
  gnu/packages/patches/ghostscript-runpath.patch		\
  gnu/packages/patches/gitolite-openssh-6.8-compat.patch	\

M gnu/packages/gcc.scm => gnu/packages/gcc.scm +3 -1
@@ 343,7 343,9 @@ Go.  It also includes runtime support libraries for these languages.")
              (sha256
               (base32
                "1bd5vj4px3s8nlakbgrh38ynxq4s654m6nxz7lrj03mvkkwgvnmp"))
              (patches (origin-patches (package-source gcc-4.9)))))))
              (patches (map search-patch
                            '("gcc-arm-link-spec-fix.patch"
                              "gcc-5.0-libvtv-runpath.patch")))))))

(define* (custom-gcc gcc name languages #:key (separate-lib-output? #t))
  "Return a custom version of GCC that supports LANGUAGES."

A gnu/packages/patches/gcc-5.0-libvtv-runpath.patch => gnu/packages/patches/gcc-5.0-libvtv-runpath.patch +15 -0
@@ 0,0 1,15 @@
GCC 4.9 and later have libvtv and, just like libstdc++ (see
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=32354), it doesn't
have $libdir in its RUNPATH, but it NEEDs libgcc_s.  This patch
fixes that.

--- gcc-5.1.0/libvtv/Makefile.in	2014-10-30 09:28:58.000000000 +0100
+++ gcc-5.1.0/libvtv/Makefile.in	2015-04-30 09:51:04.161129705 +0200
@@ -15,6 +15,7 @@
 
 @SET_MAKE@
 
+libvtv_la_LDFLAGS = -Wl,-rpath=$(libdir)
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@