1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
From: Travis Wrightsman <travis@wrightsman.org>
Date: Thu, 12 Dec 2024 15:48:58 -0800
Subject: Fix wslay compiler flags
The Debian packaging of wslay does not ship the upstream's pkg-config file yet,
so this patch is only needed for Debian until the linked bug is fixed.
Forwarded: not-needed
Bug-Debian: https://bugs.debian.org/1095615
---
platform/server/detect.py | 4 +++-
platform/x11/detect.py | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/platform/server/detect.py b/platform/server/detect.py
index 7bd5a0f..545fd04 100644
--- a/platform/server/detect.py
+++ b/platform/server/detect.py
@@ -260,7 +260,9 @@ def configure(env):
env.Append(LIBS=["mbedtls", "mbedcrypto", "mbedx509"])
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 6390c26..6c7840a 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -345,7 +345,9 @@ def configure(env):
env.Append(LIBS=["mbedtls", "mbedcrypto", "mbedx509"])
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.
|
