| 1 |
vapier 13/11/23 04:25:41 |
| 2 |
|
| 3 |
Added: gpsd-3.10-dbus.patch gpsd-3.10-udev-install.patch |
| 4 |
gpsd-3.10-rpath.patch |
| 5 |
Log: |
| 6 |
Version bump. |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key FB7C4156) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 sci-geosciences/gpsd/files/gpsd-3.10-dbus.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.10-dbus.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.10-dbus.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: gpsd-3.10-dbus.patch |
| 17 |
=================================================================== |
| 18 |
From efaf7972ca95ff52464dedfe30bafa45095d299e Mon Sep 17 00:00:00 2001 |
| 19 |
From: Bernd Zeimetz <bernd@××××.de> |
| 20 |
Date: Sat, 23 Nov 2013 02:56:22 +0100 |
| 21 |
Subject: [PATCH] Make it build abain with dbus enabled. |
| 22 |
|
| 23 |
This reverts a bad change to SConstruct in 57e9bdea. |
| 24 |
|
| 25 |
It still leaves the issue that scons links all file sstaically now. |
| 26 |
--- |
| 27 |
SConstruct | 6 +++++- |
| 28 |
1 file changed, 5 insertions(+), 1 deletion(-) |
| 29 |
|
| 30 |
diff --git a/SConstruct b/SConstruct |
| 31 |
index 290910b..51b07e1 100644 |
| 32 |
--- a/SConstruct |
| 33 |
+++ b/SConstruct |
| 34 |
@@ -968,7 +968,11 @@ gpsdlibs = ["-lgpsd"] + usblibs + bluezlibs + gpslibs |
| 35 |
# linking |
| 36 |
# The final executable will build but not be portable. |
| 37 |
|
| 38 |
-env.StaticLibrary(target = 'libgps.a', source = libgps_sources) |
| 39 |
+env.StaticLibrary(target='libgps.a', |
| 40 |
+ source=libgps_sources, |
| 41 |
+ parse_flags=dbus_libs + rtlibs) |
| 42 |
+ |
| 43 |
+ |
| 44 |
|
| 45 |
# Source groups |
| 46 |
|
| 47 |
-- |
| 48 |
1.8.4.3 |
| 49 |
|
| 50 |
|
| 51 |
|
| 52 |
|
| 53 |
1.1 sci-geosciences/gpsd/files/gpsd-3.10-udev-install.patch |
| 54 |
|
| 55 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.10-udev-install.patch?rev=1.1&view=markup |
| 56 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.10-udev-install.patch?rev=1.1&content-type=text/plain |
| 57 |
|
| 58 |
Index: gpsd-3.10-udev-install.patch |
| 59 |
=================================================================== |
| 60 |
From 6821edb2d40956e5f93a80420ae1dbf825b95281 Mon Sep 17 00:00:00 2001 |
| 61 |
From: Mike Frysinger <vapier@g.o> |
| 62 |
Date: Mon, 11 Mar 2013 13:26:57 -0400 |
| 63 |
Subject: [PATCH] fix DESTDIR handling with udev rules install again |
| 64 |
|
| 65 |
Commit 102e29d16c3fd9b414eeac53c794302f902ae8da reverted the DESTDIR |
| 66 |
logic when upgrading the udev path handling. |
| 67 |
|
| 68 |
I fixed that with commit a41cd69c87e312198834a2e6232134176c9352e5. |
| 69 |
|
| 70 |
It's been reverted yet again in an unrelated commit |
| 71 |
57e9bdeae2f00664616ee1d9a936a5cfe27bfd30. Why do people keep doing this? |
| 72 |
|
| 73 |
Signed-off-by: Mike Frysinger <vapier@g.o> |
| 74 |
--- |
| 75 |
SConstruct | 8 ++++---- |
| 76 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 77 |
|
| 78 |
diff --git a/SConstruct b/SConstruct |
| 79 |
index 51b07e1..caed21e 100644 |
| 80 |
--- a/SConstruct |
| 81 |
+++ b/SConstruct |
| 82 |
@@ -1790,10 +1790,10 @@ if env['python']: |
| 83 |
# is plugged in. |
| 84 |
|
| 85 |
Utility('udev-install', 'install', [ |
| 86 |
- 'mkdir -p ' + env['udevdir'], |
| 87 |
- 'cp $SRCDIR/gpsd.rules ' + env['udevdir'] + '/rules.d/25-gpsd.rules', |
| 88 |
- 'cp $SRCDIR/gpsd.hotplug ' + env['udevdir'], |
| 89 |
- 'chmod a+x ' + env['udevdir'] + '/gpsd.hotplug', |
| 90 |
+ 'mkdir -p ' + DESTDIR + env['udevdir'] + '/rules.d', |
| 91 |
+ 'cp $SRCDIR/gpsd.rules ' + DESTDIR + env['udevdir'] + '/rules.d/25-gpsd.rules', |
| 92 |
+ 'cp $SRCDIR/gpsd.hotplug ' + DESTDIR + env['udevdir'], |
| 93 |
+ 'chmod a+x ' + DESTDIR + env['udevdir'] + '/gpsd.hotplug', |
| 94 |
]) |
| 95 |
|
| 96 |
Utility('udev-uninstall', '', [ |
| 97 |
-- |
| 98 |
1.8.4.3 |
| 99 |
|
| 100 |
|
| 101 |
|
| 102 |
|
| 103 |
1.1 sci-geosciences/gpsd/files/gpsd-3.10-rpath.patch |
| 104 |
|
| 105 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.10-rpath.patch?rev=1.1&view=markup |
| 106 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.10-rpath.patch?rev=1.1&content-type=text/plain |
| 107 |
|
| 108 |
Index: gpsd-3.10-rpath.patch |
| 109 |
=================================================================== |
| 110 |
don't set the -rpath flag to the install dir as this breaks DESTDIR |
| 111 |
|
| 112 |
--- a/SConstruct |
| 113 |
+++ b/SConstruct |
| 114 |
@@ -287,7 +287,7 @@ def installdir(dir, add_destdir=True): |
| 115 |
# Honor the specified installation prefix in link paths. |
| 116 |
if env["sysroot"]: |
| 117 |
env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir', add_destdir=False)]) |
| 118 |
-if env["shared"]: |
| 119 |
+if env["shared"] and env["chrpath"]: |
| 120 |
env.Prepend(RPATH=[installdir('libdir')]) |
| 121 |
|
| 122 |
# Give deheader a way to set compiler flags |
Archives