9386d72e74
- Remove second patch (already in version) - Add a patch to fix build without man pages - Add a patch to remove C99-style loop Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
60 lines
2.0 KiB
Diff
60 lines
2.0 KiB
Diff
From 02d21faebec245e1526449fb54e7078914d75db7 Mon Sep 17 00:00:00 2001
|
|
From: "Gary E. Miller" <gem@rellim.com>
|
|
Date: Thu, 1 Nov 2018 15:49:01 -0700
|
|
Subject: SConstruct: Do not crash when not building python man pages.
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Retrieved from:
|
|
https://git.savannah.gnu.org/cgit/gpsd.git/commit/?id=02d21faebec245e1526449fb54e7078914d75db7]
|
|
---
|
|
SConstruct | 13 +++++++++----
|
|
1 file changed, 9 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/SConstruct b/SConstruct
|
|
index 0fc3614..0226cd2 100644
|
|
--- a/SConstruct
|
|
+++ b/SConstruct
|
|
@@ -1751,14 +1751,19 @@ if tiocmiwait:
|
|
"ppscheck.8": "ppscheck.xml",
|
|
})
|
|
|
|
-all_manpages = list(base_manpages.keys()) + list(python_manpages.keys())
|
|
+all_manpages = list(base_manpages.keys())
|
|
+if python_manpages:
|
|
+ all_manpages += list(python_manpages.keys())
|
|
|
|
man_env = env.Clone()
|
|
if man_env.GetOption('silent'):
|
|
man_env['SPAWN'] = filtered_spawn # Suppress stderr chatter
|
|
manpage_targets = []
|
|
if manbuilder:
|
|
- items = list(base_manpages.items()) + list(python_manpages.items())
|
|
+ items = list(base_manpages.items())
|
|
+ if python_manpages:
|
|
+ items += list(python_manpages.items())
|
|
+
|
|
for (man, xml) in items:
|
|
manpage_targets.append(man_env.Man(source=xml, target=man))
|
|
|
|
@@ -1907,7 +1912,7 @@ if qt_env:
|
|
|
|
|
|
maninstall = []
|
|
-for manpage in list(base_manpages.keys()) + list(python_manpages.keys()):
|
|
+for manpage in all_manpages:
|
|
if not manbuilder and not os.path.exists(manpage):
|
|
continue
|
|
section = manpage.split(".")[1]
|
|
@@ -2517,7 +2522,7 @@ if os.path.exists("gpsd.c") and os.path.exists(".gitignore"):
|
|
if ".gitignore" in distfiles:
|
|
distfiles.remove(".gitignore")
|
|
distfiles += generated_sources
|
|
- distfiles += list(base_manpages.keys()) + list(python_manpages.keys())
|
|
+ distfiles += all_manpages
|
|
if "packaging/rpm/gpsd.spec" not in distfiles:
|
|
distfiles.append("packaging/rpm/gpsd.spec")
|
|
|
|
--
|
|
cgit v1.0-41-gc330
|
|
|