From fc1f6378355baf9678c1ed8881a3e72ea881660c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 25 Sep 2022 11:52:20 +0700 Subject: [PATCH] wxPython4: fix cross build after python3-module change In build-helper 'python3', we've set _PYTHON_SYSCONFIGDATA_NAME on cross-build, but that module could be found only inside sysroot. --- srcpkgs/wxPython4/patches/cross.patch | 12 ++++++++++++ srcpkgs/wxPython4/template | 1 + 2 files changed, 13 insertions(+) create mode 100644 srcpkgs/wxPython4/patches/cross.patch diff --git a/srcpkgs/wxPython4/patches/cross.patch b/srcpkgs/wxPython4/patches/cross.patch new file mode 100644 index 00000000000..4f343de201c --- /dev/null +++ b/srcpkgs/wxPython4/patches/cross.patch @@ -0,0 +1,12 @@ +Index: wxPython-4.0.7/build.py +=================================================================== +--- wxPython-4.0.7.orig/build.py ++++ wxPython-4.0.7/build.py +@@ -169,7 +169,6 @@ def main(args): + setPythonVersion(args) + setDevModeOptions(args) + +- os.environ['PYTHONPATH'] = phoenixDir() + os.environ['PYTHONUNBUFFERED'] = 'yes' + os.environ['WXWIN'] = wxDir() + diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template index 318ab078b4d..6fe82717aca 100644 --- a/srcpkgs/wxPython4/template +++ b/srcpkgs/wxPython4/template @@ -31,6 +31,7 @@ post_extract() { pre_build() { chmod -R go+rX $wrksrc + PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}$wrksrc" if [ "$CROSS_BUILD" ]; then PYPREFIX="$XBPS_CROSS_BASE" LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib"