mirror of
https://git.yoctoproject.org/poky
synced 2026-02-07 09:16:36 +01:00
python3: resolve ncurses host contamination
(From OE-Core rev: ee7be51444b609a5cc1fd223b9395e9642d3bfac) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
216c570979
commit
39970f583d
@@ -1,4 +1,4 @@
|
||||
From 77b7af7859bb925c31c5bcbf33f30569a0bc1d40 Mon Sep 17 00:00:00 2001
|
||||
From 7ada9c749f6beb51c13a3debc850755e911548a6 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Thu, 31 Jan 2019 16:46:30 +0100
|
||||
Subject: [PATCH] distutils/sysconfig: append
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
From 863c09f640a5dfd33ff22915b0d5fee7bc5df70a Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Sun, 16 Feb 2020 17:50:25 +0100
|
||||
Subject: [PATCH] configure.ac, setup.py: do not add a curses include path from
|
||||
the host
|
||||
|
||||
This leads to host contamination, and particularly can cause
|
||||
curses modules to fail at runtime if the host curses is configured
|
||||
differently to native curses (observed on current OpenSuse Tumbleweed
|
||||
as dnf failures).
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
configure.ac | 6 ------
|
||||
setup.py | 2 --
|
||||
2 files changed, 8 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 915f475..c911011 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -4828,12 +4828,6 @@ then
|
||||
[Define if you have struct stat.st_mtimensec])
|
||||
fi
|
||||
|
||||
-# first curses header check
|
||||
-ac_save_cppflags="$CPPFLAGS"
|
||||
-if test "$cross_compiling" = no; then
|
||||
- CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
|
||||
-fi
|
||||
-
|
||||
AC_CHECK_HEADERS(curses.h ncurses.h)
|
||||
|
||||
# On Solaris, term.h requires curses.h
|
||||
diff --git a/setup.py b/setup.py
|
||||
index b0f1541..7208cd0 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -973,8 +973,6 @@ class PyBuildExt(build_ext):
|
||||
panel_library = 'panel'
|
||||
if curses_library == 'ncursesw':
|
||||
curses_defines.append(('HAVE_NCURSESW', '1'))
|
||||
- if not CROSS_COMPILING:
|
||||
- curses_includes.append('/usr/include/ncursesw')
|
||||
# Bug 1464056: If _curses.so links with ncursesw,
|
||||
# _curses_panel.so must link with panelw.
|
||||
panel_library = 'panelw'
|
||||
@@ -1,4 +1,4 @@
|
||||
From b1f68fe102b289a10504fae716a9eaa8677e3c5b Mon Sep 17 00:00:00 2001
|
||||
From 251347fc970a397a9cd63ed3f87c5e6c52e15187 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 14 May 2013 15:00:26 -0700
|
||||
Subject: [PATCH] python3: Add target and native recipes
|
||||
|
||||
Reference in New Issue
Block a user