[gentoo-commits] gentoo-x86 commit in sci-geosciences/gpsd/files: gpsd-3.7-rpath.patch

[Mike Frysinger (vapier)]

vapier      12/08/01 21:51:58

  Added:                gpsd-3.7-rpath.patch
  Log:
  Version bump.
  
  (Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-geosciences/gpsd/files/gpsd-3.7-rpath.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.7-rpath.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.7-rpath.patch?rev=1.1&content-type=text/plain

Index: gpsd-3.7-rpath.patch
===================================================================
don't set the -rpath/-L flags to the install dir as this breaks DESTDIR

--- a/SConstruct
+++ b/SConstruct
@@ -268,11 +268,7 @@
     return wrapped
 
 # Honor the specified installation prefix in link paths.
-if not env["sysroot"]:
-    env.Prepend(LIBPATH=[installdir('libdir')])
-else:
-    env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir')])
-if env["shared"]:
+if env["shared"] and env["chrpath"]:
     env.Prepend(RPATH=[installdir('libdir')])
 
 # Give deheader a way to set compiler flags