summaryrefslogtreecommitdiff
path: root/recipes-navigation
diff options
context:
space:
mode:
authorSerhii Voloshynov <serhii.voloshynov@globallogic.com>2020-12-14 20:48:50 +0200
committerJohn Klug <john.klug@multitech.com>2021-01-04 13:27:20 -0600
commitab4139af48b4c1d66ee495217af9f2b6cb0f82ca (patch)
tree9f4ce2da0c7123a958f496d34f06d71bbc36ff47 /recipes-navigation
parent66a9d870b72f186b9d749d2084133941780efa79 (diff)
downloadmeta-mlinux-ab4139af48b4c1d66ee495217af9f2b6cb0f82ca.tar.gz
meta-mlinux-ab4139af48b4c1d66ee495217af9f2b6cb0f82ca.tar.bz2
meta-mlinux-ab4139af48b4c1d66ee495217af9f2b6cb0f82ca.zip
add missing patch
Diffstat (limited to 'recipes-navigation')
-rw-r--r--recipes-navigation/gpsd/gpsd-3.20/0002-SConstruct-fix.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/recipes-navigation/gpsd/gpsd-3.20/0002-SConstruct-fix.patch b/recipes-navigation/gpsd/gpsd-3.20/0002-SConstruct-fix.patch
new file mode 100644
index 0000000..111e304
--- /dev/null
+++ b/recipes-navigation/gpsd/gpsd-3.20/0002-SConstruct-fix.patch
@@ -0,0 +1,43 @@
+From f59c31cc7c36944e9a45ac920ce14233060a7a11 Mon Sep 17 00:00:00 2001
+From: Serhii Voloshynov <serhii.voloshynov@globallogic.com>
+Date: Tue, 8 Dec 2020 11:04:12 +0200
+Subject: [PATCH] fix unbuildable SConstruct. the fix was taken from previous
+ versions
+
+---
+ SConstruct | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 6546f73..3742e43 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -386,17 +386,19 @@ env['SC_PYTHON'] = sys.executable # Path to SCons Python
+ # So we rely on MergeFlags/ParseFlags to do the right thing for us.
+ env['STRIP'] = "strip"
+ env['PKG_CONFIG'] = "pkg-config"
+-for i in ["AR", "CC", "CXX", "LD",
+- "PKG_CONFIG", "STRIP", "TAR"]:
++for i in ["AR", "ARFLAGS", "CC", "CCFLAGS", "CFLAGS", "CXX", "CXXFLAGS", "LD",
++ "LINKFLAGS", "PKG_CONFIG", "STRIP", "TAR"]:
+ if i in os.environ:
+ j = i
+ if i == "LD":
+ i = "SHLINK"
+- env[i] = os.getenv(j)
+-for i in ["ARFLAGS", "CFLAGS", "CXXFLAGS", "LDFLAGS", "SHLINKFLAGS",
+- "CPPFLAGS", "CCFLAGS", "LINKFLAGS"]:
++ if i in ("CFLAGS", "CCFLAGS", "LINKFLAGS"):
++ env.Replace(**{j: Split(os.getenv(i))})
++ else:
++ env.Replace(**{j: os.getenv(i)})
++for flag in ["LDFLAGS", "SHLINKFLAGS", "CPPFLAGS"]:
+ if i in os.environ:
+- env.MergeFlags(Split(os.getenv(i)))
++ env.MergeFlags({flag: Split(os.getenv(flag))})
+
+
+ # Keep scan-build options in the environment
+--
+2.7.4
+