diff options
Diffstat (limited to 'meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/wxgtk-fixup-build-scripts.patch')
-rw-r--r-- | meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/wxgtk-fixup-build-scripts.patch | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/wxgtk-fixup-build-scripts.patch b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/wxgtk-fixup-build-scripts.patch index 0d65ebb598..09497133b0 100644 --- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/wxgtk-fixup-build-scripts.patch +++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/wxgtk-fixup-build-scripts.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | Fix issues in build scripts: | 1 | From 171df10f86be6defb9e317ac62df8a7b0389b901 Mon Sep 17 00:00:00 2001 |
2 | From: Kai Kang <kai.kang@windriver.com> | ||
3 | Date: Wed, 30 Mar 2022 17:39:33 +0800 | ||
4 | Subject: [PATCH] Fix issues in build scripts: | ||
2 | 5 | ||
3 | * remove hardcode lib path from buildtools/config.py which is not suitable for | 6 | * remove hardcode lib path from buildtools/config.py which is not suitable for |
4 | cross build | 7 | cross build |
@@ -15,10 +18,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> | |||
15 | 2 files changed, 4 insertions(+), 4 deletions(-) | 18 | 2 files changed, 4 insertions(+), 4 deletions(-) |
16 | 19 | ||
17 | diff --git a/buildtools/config.py b/buildtools/config.py | 20 | diff --git a/buildtools/config.py b/buildtools/config.py |
18 | index c837e5d..d426005 100644 | 21 | index 94c216ec..b3ec3f2e 100644 |
19 | --- a/buildtools/config.py | 22 | --- a/buildtools/config.py |
20 | +++ b/buildtools/config.py | 23 | +++ b/buildtools/config.py |
21 | @@ -312,8 +312,8 @@ class Configuration(object): | 24 | @@ -336,8 +336,8 @@ class Configuration(object): |
22 | # wx-config doesn't output that for some reason. For now, just | 25 | # wx-config doesn't output that for some reason. For now, just |
23 | # add it unconditionally but we should really check if the lib is | 26 | # add it unconditionally but we should really check if the lib is |
24 | # really found there or wx-config should be fixed. | 27 | # really found there or wx-config should be fixed. |
@@ -30,10 +33,10 @@ index c837e5d..d426005 100644 | |||
30 | # Move the various -I, -D, etc. flags we got from the config scripts | 33 | # Move the various -I, -D, etc. flags we got from the config scripts |
31 | # into the distutils lists. | 34 | # into the distutils lists. |
32 | diff --git a/setup.py b/setup.py | 35 | diff --git a/setup.py b/setup.py |
33 | index 64bec4b..fb29253 100644 | 36 | index fad5aba8..eade737b 100644 |
34 | --- a/setup.py | 37 | --- a/setup.py |
35 | +++ b/setup.py | 38 | +++ b/setup.py |
36 | @@ -130,7 +130,7 @@ class wx_build(orig_build): | 39 | @@ -135,7 +135,7 @@ class wx_build(orig_build): |
37 | 'message and the wxWidgets and Phoenix build steps in the future.\n') | 40 | 'message and the wxWidgets and Phoenix build steps in the future.\n') |
38 | 41 | ||
39 | # Use the same Python that is running this script. | 42 | # Use the same Python that is running this script. |
@@ -42,7 +45,7 @@ index 64bec4b..fb29253 100644 | |||
42 | cmd = ' '.join(cmd) | 45 | cmd = ' '.join(cmd) |
43 | runcmd(cmd) | 46 | runcmd(cmd) |
44 | 47 | ||
45 | @@ -233,7 +233,7 @@ if haveWheel: | 48 | @@ -238,7 +238,7 @@ if haveWheel: |
46 | class wx_install(orig_install): | 49 | class wx_install(orig_install): |
47 | def finalize_options(self): | 50 | def finalize_options(self): |
48 | orig_install.finalize_options(self) | 51 | orig_install.finalize_options(self) |