a29905c42b
New patches (both for SConstruct): * Do not import from distutils. Since Python support/modules are not built, there is no need to import from distutils. (Importing from distutils may prevent the package from being built on systems without a full distutils module, e.g. Debian with python3-minimal.) I have added back the import in places where it may be helpful to have, if scons is run manually. Fixes #10993. * Do not check the size of time_t. The way this is done is to compile and run a test program; this fails when cross-compiling[1]. This doesn't appear to affect any functionality (other than missing a compile-time warning that things will fail in 2038 if time_t is too small). [1]: https://gitlab.com/gpsd/gpsd/issues/48 Signed-off-by: Jeffery To <jeffery.to@gmail.com>
13 lines
589 B
Diff
13 lines
589 B
Diff
--- a/SConstruct
|
|
+++ b/SConstruct
|
|
@@ -874,6 +874,10 @@ else:
|
|
ncurseslibs += pkg_config('tinfo', rpath_hack=True)
|
|
# It's not yet known whether rpath_hack is appropriate for
|
|
# ncurses5-config.
|
|
+ elif WhereIs('ncurses6-config'):
|
|
+ ncurseslibs = ['!ncurses6-config --libs --cflags']
|
|
+ elif WhereIs('ncursesw6-config'):
|
|
+ ncurseslibs = ['!ncursesw6-config --libs --cflags']
|
|
elif WhereIs('ncurses5-config'):
|
|
ncurseslibs = ['!ncurses5-config --libs --cflags']
|
|
elif WhereIs('ncursesw5-config'):
|