From f528f9614f9f2b4712bbbd37041c29b505322f4d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 16 Apr 2021 10:50:32 -0700 Subject: python3-icu: Upgrade to 2.7.2 License-Update: Use info in setup.py for license as dedicated LICENSE file has disappeared. License still is MIT Signed-off-by: Khem Raj Signed-off-by: Trevor Gamblin --- ...1-Fix-host-contamination-of-include-files.patch | 40 ++++++++++++++++++++++ .../python/python3-icu/fix_host_include.patch | 30 ---------------- 2 files changed, 40 insertions(+), 30 deletions(-) create mode 100644 meta-python/recipes-devtools/python/python3-icu/0001-Fix-host-contamination-of-include-files.patch delete mode 100644 meta-python/recipes-devtools/python/python3-icu/fix_host_include.patch (limited to 'meta-python/recipes-devtools/python/python3-icu') diff --git a/meta-python/recipes-devtools/python/python3-icu/0001-Fix-host-contamination-of-include-files.patch b/meta-python/recipes-devtools/python/python3-icu/0001-Fix-host-contamination-of-include-files.patch new file mode 100644 index 0000000000..c45217a88a --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-icu/0001-Fix-host-contamination-of-include-files.patch @@ -0,0 +1,40 @@ +From 8abf79f77d9151d6786da3c8e868117822bce6d4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 16 Apr 2021 10:48:36 -0700 +Subject: [PATCH] Fix host contamination of include files + +python3-icu-2.5-r0 do_package_qa: QA Issue: python3-icu: The compile log indicates that host include and/or library paths were used. + +Also, don't use icu-config + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Armin Kuster +Signed-off-by: Khem Raj +--- + setup.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index e647db4..abed399 100644 +--- a/setup.py ++++ b/setup.py +@@ -81,7 +81,7 @@ Building PyICU %s for ICU %s (max ICU major version supported: %s) + + CONFIGURE_WITH_ICU_CONFIG = { + 'darwin': True, +- 'linux': True, ++ 'linux': False, + 'freebsd': False, # not tested + 'win32': False, # no icu-config + 'sunos5': False, # not tested +@@ -267,7 +267,6 @@ setup(name="PyICU", + ext_modules=[Extension('_icu', + [filename for filename in sorted(os.listdir(os.curdir)) + if filename.endswith('.cpp')], +- include_dirs=_includes, + extra_compile_args=_cflags, + extra_link_args=_lflags, + libraries=_libraries)], +-- +2.31.1 + diff --git a/meta-python/recipes-devtools/python/python3-icu/fix_host_include.patch b/meta-python/recipes-devtools/python/python3-icu/fix_host_include.patch deleted file mode 100644 index 1b6e890436..0000000000 --- a/meta-python/recipes-devtools/python/python3-icu/fix_host_include.patch +++ /dev/null @@ -1,30 +0,0 @@ -Fixed host contamination of include files - -python3-icu-2.5-r0 do_package_qa: QA Issue: python3-icu: The compile log indicates that host include and/or library paths were used. - -Also, don't use icu-config - -Upstream-Status: [inappropriate] OE specific -Signed-off-by: Armin Kuster - -Index: PyICU-2.5/setup.py -=================================================================== ---- PyICU-2.5.orig/setup.py -+++ PyICU-2.5/setup.py -@@ -81,7 +81,7 @@ Building PyICU %s for ICU %s (max ICU ma - - CONFIGURE_WITH_ICU_CONFIG = { - 'darwin': True, -- 'linux': True, -+ 'linux': False, - 'freebsd': False, # not tested - 'win32': False, # no icu-config - 'sunos5': False, # not tested -@@ -274,7 +274,6 @@ setup(name="PyICU", - ext_modules=[Extension('_icu', - [filename for filename in sorted(os.listdir(os.curdir)) - if filename.endswith('.cpp')], -- include_dirs=_includes, - extra_compile_args=_cflags, - extra_link_args=_lflags, - libraries=_libraries)], -- cgit v1.2.3-54-g00ecf