| 1 |
vapier 13/03/27 20:12:37 |
| 2 |
|
| 3 |
Added: gpsd-3.7-gps_regress.patch |
| 4 |
Log: |
| 5 |
Fix build error when USE=-sockets #441760 by Conrad Kostecki. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key FB7C4156) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-geosciences/gpsd/files/gpsd-3.7-gps_regress.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.7-gps_regress.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.7-gps_regress.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: gpsd-3.7-gps_regress.patch |
| 16 |
=================================================================== |
| 17 |
https://bugs.gentoo.org/441760 |
| 18 |
|
| 19 |
From 52dedf2ca8b31a8d113a1d9b14977d5d9b782744 Mon Sep 17 00:00:00 2001 |
| 20 |
From: Mike Frysinger <vapier@g.o> |
| 21 |
Date: Wed, 27 Mar 2013 16:13:30 -0400 |
| 22 |
Subject: [PATCH] fix build error when socket_export is disabled |
| 23 |
|
| 24 |
If you try to build with socket_export disabled, you'll hit a build |
| 25 |
failure due to gps_regress being undefined: |
| 26 |
|
| 27 |
NameError: name 'gps_regress' is not defined: |
| 28 |
File "SConstruct", line 1519: |
| 29 |
gps_regress, |
| 30 |
|
| 31 |
Signed-off-by: Mike Frysinger <vapier@g.o> |
| 32 |
--- |
| 33 |
SConstruct | 9 +++++---- |
| 34 |
1 file changed, 5 insertions(+), 4 deletions(-) |
| 35 |
|
| 36 |
diff --git a/SConstruct b/SConstruct |
| 37 |
index 1c187f3..a2b7a4c 100644 |
| 38 |
--- a/SConstruct |
| 39 |
+++ b/SConstruct |
| 40 |
@@ -1394,8 +1394,8 @@ else: |
| 41 |
# using regress-drivers requires socket_export being enabled. |
| 42 |
if env['socket_export']: |
| 43 |
# Regression-test the daemon |
| 44 |
- gps_regress = Utility("gps-regress", [gpsd, python_built_extensions], |
| 45 |
- '$SRCDIR/regress-driver test/daemon/*.log') |
| 46 |
+ gps_regress = [Utility("gps-regress", [gpsd, python_built_extensions], |
| 47 |
+ '$SRCDIR/regress-driver test/daemon/*.log')] |
| 48 |
|
| 49 |
# Test that super-raw mode works. Compare each logfile against itself |
| 50 |
# dumped through the daemon running in R=2 mode. (This test is not |
| 51 |
@@ -1410,6 +1410,8 @@ if env['socket_export']: |
| 52 |
# offset from subframe data. |
| 53 |
Utility('gps-makeregress', [gpsd, python_built_extensions], |
| 54 |
'$SRCDIR/regress-driver -b test/daemon/*.log') |
| 55 |
+else: |
| 56 |
+ gps_regress = [] |
| 57 |
|
| 58 |
# To build an individual test for a load named foo.log, put it in |
| 59 |
# test/daemon and do this: |
| 60 |
@@ -1550,7 +1552,6 @@ flocktest = Utility("flocktest", [], "cd devtools; ./flocktest " + gitrepo) |
| 61 |
check = env.Alias('check', [ |
| 62 |
python_compilation_regress, |
| 63 |
bits_regress, |
| 64 |
- gps_regress, |
| 65 |
rtcm_regress, |
| 66 |
aivdm_regress, |
| 67 |
packet_regress, |
| 68 |
@@ -1559,7 +1560,7 @@ check = env.Alias('check', [ |
| 69 |
time_regress, |
| 70 |
unpack_regress, |
| 71 |
json_regress, |
| 72 |
- ]) |
| 73 |
+ ] + gps_regress) |
| 74 |
|
| 75 |
env.Alias('testregress', check) |
| 76 |
|
| 77 |
-- |
| 78 |
1.8.1.2 |
Archives