61 lines
2.2 KiB
Diff
61 lines
2.2 KiB
Diff
From c4ad00c801854c34d61a2e6d930926a73a097272 Mon Sep 17 00:00:00 2001
|
|
From: jeremyd2019 <github@jdrake.com>
|
|
Date: Mon, 22 Nov 2021 16:04:41 -0800
|
|
Subject: [PATCH 106/N] handle ncursesw pkg-config when cross-compiling
|
|
|
|
strip extra args from pkg-config --cflags-only-I, setup.py is only expecting a single path.
|
|
|
|
Use pkg-config ncursesw include dir even if cross-compiling (PKG_CONFIG_PATH should be set in that case).
|
|
---
|
|
configure.ac | 8 +++-----
|
|
setup.py | 3 +--
|
|
2 files changed, 4 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index df6aaee..cff7e39 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -3872,7 +3872,7 @@ else
|
|
fi
|
|
|
|
if test "$with_system_ffi" = "yes" && test -n "$PKG_CONFIG"; then
|
|
- LIBFFI_INCLUDEDIR="`"$PKG_CONFIG" libffi --cflags-only-I 2>/dev/null | sed -e 's/^-I//;s/ *$//'`"
|
|
+ LIBFFI_INCLUDEDIR="`"$PKG_CONFIG" libffi --cflags-only-I 2>/dev/null | sed -e 's/^-I//;s/ .*$//'`"
|
|
else
|
|
LIBFFI_INCLUDEDIR=""
|
|
fi
|
|
@@ -6443,7 +6443,7 @@ then
|
|
fi
|
|
|
|
if test -n "$PKG_CONFIG"; then
|
|
- NCURSESW_INCLUDEDIR="`"$PKG_CONFIG" ncursesw --cflags-only-I 2>/dev/null | sed -e 's/^-I//;s/ *$//'`"
|
|
+ NCURSESW_INCLUDEDIR="`"$PKG_CONFIG" ncursesw --cflags-only-I 2>/dev/null | sed -e 's/^-I//;s/ .*$//'`"
|
|
else
|
|
NCURSESW_INCLUDEDIR=""
|
|
fi
|
|
@@ -6451,9 +6451,7 @@ AC_SUBST(NCURSESW_INCLUDEDIR)
|
|
|
|
# first curses header check
|
|
ac_save_cppflags="$CPPFLAGS"
|
|
-if test "$cross_compiling" = no; then
|
|
- CPPFLAGS="$CPPFLAGS -I$NCURSESW_INCLUDEDIR"
|
|
-fi
|
|
+CPPFLAGS="$CPPFLAGS -I$NCURSESW_INCLUDEDIR"
|
|
|
|
AC_CHECK_HEADERS(curses.h ncurses.h)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index 2b07c4c..17a7d48 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -1155,8 +1155,7 @@ class PyBuildExt(build_ext):
|
|
panel_library = 'panel'
|
|
if curses_library == 'ncursesw':
|
|
curses_defines.append(('HAVE_NCURSESW', '1'))
|
|
- if not CROSS_COMPILING:
|
|
- curses_includes.append(sysconfig.get_config_var("NCURSESW_INCLUDEDIR"))
|
|
+ curses_includes.append(sysconfig.get_config_var("NCURSESW_INCLUDEDIR"))
|
|
# Bug 1464056: If _curses.so links with ncursesw,
|
|
# _curses_panel.so must link with panelw.
|
|
panel_library = 'panelw'
|