From: | "Mike Frysinger (vapier)" <vapier@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in sci-geosciences/gpsd/files: gpsd-3.11-rpath.patch |
Date: | Thu, 30 Oct 2014 21:16:14 |
Message-Id: | 20141030211611.4B55C918E@oystercatcher.gentoo.org |
1 | vapier 14/10/30 21:16:11 |
2 | |
3 | Added: gpsd-3.11-rpath.patch |
4 | Log: |
5 | Update ebuild to match latest git source #527000 by Michal Privoznik. |
6 | |
7 | (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
8 | |
9 | Revision Changes Path |
10 | 1.1 sci-geosciences/gpsd/files/gpsd-3.11-rpath.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.11-rpath.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.11-rpath.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: gpsd-3.11-rpath.patch |
16 | =================================================================== |
17 | don't set the -rpath flag to the install dir as this breaks DESTDIR |
18 | |
19 | --- a/SConstruct |
20 | +++ b/SConstruct |
21 | @@ -287,7 +287,7 @@ |
22 | |
23 | # Don't hack RPATH unless libdir points somewhere that is not on the |
24 | # minimum default load path. |
25 | -if env["shared"]: |
26 | +if env["shared"] and env["chrpath"]: |
27 | if env["libdir"] not in ["/usr/lib", "/lib"]: |
28 | env.Prepend(RPATH=[installdir('libdir')]) |