mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-02-19 16:00:26 +00:00
a01270e642
This addresses python 3.13 issues. License-Update: added bsd-2-clause to LICENSE.txt Drop 0001-sip-Fix-build-with-gcc-14.patch as already fixed upstream. Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
57 lines
2.2 KiB
Diff
57 lines
2.2 KiB
Diff
From 171df10f86be6defb9e317ac62df8a7b0389b901 Mon Sep 17 00:00:00 2001
|
|
From: Kai Kang <kai.kang@windriver.com>
|
|
Date: Wed, 30 Mar 2022 17:39:33 +0800
|
|
Subject: [PATCH] Fix issues in build scripts:
|
|
|
|
* remove hardcode lib path from buildtools/config.py which is not suitable for
|
|
cross build
|
|
* only build target 'build_py' in setup.py
|
|
* do not override self.install_lib with self.install_platlib which causes
|
|
package issue when multilib is enabled.
|
|
|
|
Upstream-Status: Pending [cross build specific]
|
|
|
|
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
|
---
|
|
buildtools/config.py | 4 ++--
|
|
setup.py | 4 ++--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/buildtools/config.py b/buildtools/config.py
|
|
index 94c216ec..b3ec3f2e 100644
|
|
--- a/buildtools/config.py
|
|
+++ b/buildtools/config.py
|
|
@@ -336,8 +336,8 @@ class Configuration(object):
|
|
# wx-config doesn't output that for some reason. For now, just
|
|
# add it unconditionally but we should really check if the lib is
|
|
# really found there or wx-config should be fixed.
|
|
- if self.WXPORT != 'msw':
|
|
- self.libdirs.append("/usr/X11R6/lib")
|
|
+ #if self.WXPORT != 'msw':
|
|
+ # self.libdirs.append("/usr/X11R6/lib")
|
|
|
|
# Move the various -I, -D, etc. flags we got from the config scripts
|
|
# into the distutils lists.
|
|
diff --git a/setup.py b/setup.py
|
|
index fad5aba8..eade737b 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -135,7 +135,7 @@ class wx_build(orig_build):
|
|
'message and the wxWidgets and Phoenix build steps in the future.\n')
|
|
|
|
# Use the same Python that is running this script.
|
|
- cmd = ['"{}"'.format(sys.executable), '-u', 'build.py', 'build']
|
|
+ cmd = ['"{}"'.format(sys.executable), '-u', 'build.py', 'build_py']
|
|
cmd = ' '.join(cmd)
|
|
runcmd(cmd)
|
|
|
|
@@ -238,7 +238,7 @@ if haveWheel:
|
|
class wx_install(orig_install):
|
|
def finalize_options(self):
|
|
orig_install.finalize_options(self)
|
|
- self.install_lib = self.install_platlib
|
|
+ #self.install_lib = self.install_platlib
|
|
|
|
def run(self):
|
|
self.run_command("build")
|