Fix wslay and recast compiler flags

Gbp-Pq: Name Fix-wslay-and-recast-compiler-flags.patch

diff --git a/platform/server/detect.py b/platform/server/detect.py
index 7bd5a0fd7716f566dbffccc6356254745631490e..419e81c43763d7f0f235bc8c1d5cddb46851d4c6 100644 (file)
--- a/platform/server/detect.py
+++ b/platform/server/detect.py
@@ -259,8 +259,14 @@ def configure(env):
         # mbedTLS does not provide a pkgconfig config yet. See https://github.com/ARMmbed/mbedtls/issues/228
         env.Append(LIBS=["mbedtls", "mbedcrypto", "mbedx509"])
 
+    if not env["builtin_recast"]:
+        env.Append(LIBS=["Recast"])
+        env.Prepend(CPPPATH=["/usr/include/recastnavigation"])
+
     if not env["builtin_wslay"]:
-        env.ParseConfig("pkg-config libwslay --cflags --libs")
+        # wslay in Debian does not have a pkg-config configuration
+        env.Prepend(CPPPATH=["/usr/include/wslay"])
+        env.Append(LIBS=["wslay"])
 
     if not env["builtin_miniupnpc"]:
         # No pkgconfig file so far, hardcode default paths.

diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 6390c263a7abced11a3c4cd179e7cf28823f5f08..fd9d90c260808e3a06c1cf43f646265c7e94d01c 100644 (file)
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -344,8 +344,14 @@ def configure(env):
         # mbedTLS does not provide a pkgconfig config yet. See https://github.com/ARMmbed/mbedtls/issues/228
         env.Append(LIBS=["mbedtls", "mbedcrypto", "mbedx509"])
 
+    if not env["builtin_recast"]:
+        env.Append(LIBS=["Recast"])
+        env.Prepend(CPPPATH=["/usr/include/recastnavigation"])
+
     if not env["builtin_wslay"]:
-        env.ParseConfig("pkg-config libwslay --cflags --libs")
+        # wslay in Debian does not have a pkg-config configuration
+        env.Prepend(CPPPATH=["/usr/include/wslay"])
+        env.Append(LIBS=["wslay"])
 
     if not env["builtin_miniupnpc"]:
         # No pkgconfig file so far, hardcode default paths.