aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/gcc-libvtv-runpath.patch
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-04-30 13:31:59 +0200
committerLudovic Courtès <ludo@gnu.org>2015-04-30 13:31:59 +0200
commit7e35b9dd3ddb6ec4b9bed3c01a99fe1638e96c66 (patch)
tree20aa00e6a1ee3203549ec5e702418f2d5a8b3d10 /gnu/packages/patches/gcc-libvtv-runpath.patch
parentb416c647e934c1a086a3cb534d31968e7ea53808 (diff)
downloadguix-7e35b9dd3ddb6ec4b9bed3c01a99fe1638e96c66.tar
guix-7e35b9dd3ddb6ec4b9bed3c01a99fe1638e96c66.tar.gz
gnu: gcc: Add $libdir to the RUNPATH of libvtv.so.
* gnu/packages/gcc.scm (gcc-4.9): Inherit from GCC-4.8. [source]: Add 'gcc-libvtv-runpath.patch'. (gcc-5.1): Inherit from GCC-4.9. [source]: Use patches from GCC-4.9. * gnu/packages/patches/gcc-libvtv-runpath.patch: New file. * gnu-system.am (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu/packages/patches/gcc-libvtv-runpath.patch')
-rw-r--r--gnu/packages/patches/gcc-libvtv-runpath.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/gnu/packages/patches/gcc-libvtv-runpath.patch b/gnu/packages/patches/gcc-libvtv-runpath.patch
new file mode 100644
index 0000000000..df74363c83
--- /dev/null
+++ b/gnu/packages/patches/gcc-libvtv-runpath.patch
@@ -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-4.9.2/libvtv/Makefile.in 2014-10-30 09:28:58.000000000 +0100
++++ gcc-4.9.2/libvtv/Makefile.in 2015-04-30 09:51:04.161129705 +0200
+@@ -15,6 +15,7 @@
+
+ @SET_MAKE@
+
++AM_LDFLAGS = -Wl,-rpath=$(libdir)
+
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@