mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
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.
This commit is contained in:
parent
4e9f592058
commit
167a05aabc
3 changed files with 19 additions and 1 deletions
|
@ -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 \
|
||||
|
|
|
@ -343,7 +343,9 @@ (define-public gcc-5.1
|
|||
(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."
|
||||
|
|
15
gnu/packages/patches/gcc-5.0-libvtv-runpath.patch
Normal file
15
gnu/packages/patches/gcc-5.0-libvtv-runpath.patch
Normal file
|
@ -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@
|
Loading…
Reference in a new issue