mirror of
https://github.com/markqvist/Sideband.git
synced 2025-11-09 02:35:05 -05:00
Updated build recipes
This commit is contained in:
parent
846e7d7687
commit
6a133842db
32 changed files with 1154 additions and 1614 deletions
|
|
@ -0,0 +1,19 @@
|
|||
--- Python-3.11.5/Lib/ctypes/util.py 2023-08-24 17:39:18.000000000 +0530
|
||||
+++ Python-3.11.5.mod/Lib/ctypes/util.py 2023-11-18 22:12:17.356160615 +0530
|
||||
@@ -4,7 +4,15 @@
|
||||
import sys
|
||||
|
||||
# find_library(name) returns the pathname of a library, or None.
|
||||
-if os.name == "nt":
|
||||
+
|
||||
+# This patch overrides the find_library to look in the right places on
|
||||
+# Android
|
||||
+if True:
|
||||
+ from android._ctypes_library_finder import find_library as _find_lib
|
||||
+ def find_library(name):
|
||||
+ return _find_lib(name)
|
||||
+
|
||||
+elif os.name == "nt":
|
||||
|
||||
def _get_build_version():
|
||||
"""Return the version of MSVC that was used to build Python.
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
|
||||
--- a/Lib/ctypes/util.py
|
||||
+++ b/Lib/ctypes/util.py
|
||||
@@ -67,4 +67,11 @@
|
||||
return fname
|
||||
return None
|
||||
|
||||
+# This patch overrides the find_library to look in the right places on
|
||||
+# Android
|
||||
+if True:
|
||||
+ from android._ctypes_library_finder import find_library as _find_lib
|
||||
+ def find_library(name):
|
||||
+ return _find_lib(name)
|
||||
+
|
||||
elif os.name == "posix" and sys.platform == "darwin":
|
||||
12
recipes/python3/patches/py3.7.1_fix-zlib-version.patch
Normal file
12
recipes/python3/patches/py3.7.1_fix-zlib-version.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
--- Python-3.7.1/setup.py.orig 2018-10-20 08:04:19.000000000 +0200
|
||||
+++ Python-3.7.1/setup.py 2019-02-17 00:24:30.715904412 +0100
|
||||
@@ -1410,7 +1410,8 @@ class PyBuildExt(build_ext):
|
||||
if zlib_inc is not None:
|
||||
zlib_h = zlib_inc[0] + '/zlib.h'
|
||||
version = '"0.0.0"'
|
||||
- version_req = '"1.1.3"'
|
||||
+ version_req = '"{}"'.format(
|
||||
+ os.environ.get('ZLIB_VERSION', '1.1.3'))
|
||||
if host_platform == 'darwin' and is_macosx_sdk_path(zlib_h):
|
||||
zlib_h = os.path.join(macosx_sdk_root(), zlib_h[1:])
|
||||
with open(zlib_h) as fp:
|
||||
14
recipes/python3/patches/py3.7.1_fix_cortex_a8.patch
Normal file
14
recipes/python3/patches/py3.7.1_fix_cortex_a8.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
This patch removes --fix-cortex-a8 from the linker flags in order to support linking
|
||||
with lld, as lld does not support this flag (https://github.com/android-ndk/ndk/issues/766).
|
||||
diff --git a/configure b/configure
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -5671,7 +5671,7 @@ $as_echo_n "checking for the Android arm ABI... " >&6; }
|
||||
$as_echo "$_arm_arch" >&6; }
|
||||
if test "$_arm_arch" = 7; then
|
||||
BASECFLAGS="${BASECFLAGS} -mfloat-abi=softfp -mfpu=vfpv3-d16"
|
||||
- LDFLAGS="${LDFLAGS} -march=armv7-a -Wl,--fix-cortex-a8"
|
||||
+ LDFLAGS="${LDFLAGS} -march=armv7-a"
|
||||
fi
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not Android" >&5
|
||||
42
recipes/python3/patches/py3.8.1.patch
Normal file
42
recipes/python3/patches/py3.8.1.patch
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
|
||||
index 97973bc..053c231 100644
|
||||
--- a/Lib/ctypes/util.py
|
||||
+++ b/Lib/ctypes/util.py
|
||||
@@ -67,6 +67,13 @@ if os.name == "nt":
|
||||
return fname
|
||||
return None
|
||||
|
||||
+# This patch overrides the find_library to look in the right places on
|
||||
+# Android
|
||||
+if True:
|
||||
+ from android._ctypes_library_finder import find_library as _find_lib
|
||||
+ def find_library(name):
|
||||
+ return _find_lib(name)
|
||||
+
|
||||
elif os.name == "posix" and sys.platform == "darwin":
|
||||
from ctypes.macholib.dyld import dyld_find as _dyld_find
|
||||
def find_library(name):
|
||||
diff --git a/configure b/configure
|
||||
index 0914e24..dd00812 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -18673,4 +18673,3 @@ if test "$Py_OPT" = 'false' -a "$Py_DEBUG" != 'true'; then
|
||||
echo "" >&6
|
||||
echo "" >&6
|
||||
fi
|
||||
-
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 20d7f35..af15cc2 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -1501,7 +1501,9 @@ class PyBuildExt(build_ext):
|
||||
if zlib_inc is not None:
|
||||
zlib_h = zlib_inc[0] + '/zlib.h'
|
||||
version = '"0.0.0"'
|
||||
- version_req = '"1.1.3"'
|
||||
+ # version_req = '"1.1.3"'
|
||||
+ version_req = '"{}"'.format(
|
||||
+ os.environ.get('ZLIB_VERSION', '1.1.3'))
|
||||
if MACOS and is_macosx_sdk_path(zlib_h):
|
||||
zlib_h = os.path.join(macosx_sdk_root(), zlib_h[1:])
|
||||
with open(zlib_h) as fp:
|
||||
15
recipes/python3/patches/py3.8.1_fix_cortex_a8.patch
Normal file
15
recipes/python3/patches/py3.8.1_fix_cortex_a8.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
This patch removes --fix-cortex-a8 from the linker flags in order to support linking
|
||||
with lld, as lld does not support this flag (https://github.com/android-ndk/ndk/issues/766).
|
||||
diff --git a/configure b/configure
|
||||
index 0914e24..7517168 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -5642,7 +5642,7 @@ $as_echo_n "checking for the Android arm ABI... " >&6; }
|
||||
$as_echo "$_arm_arch" >&6; }
|
||||
if test "$_arm_arch" = 7; then
|
||||
BASECFLAGS="${BASECFLAGS} -mfloat-abi=softfp -mfpu=vfpv3-d16"
|
||||
- LDFLAGS="${LDFLAGS} -march=armv7-a -Wl,--fix-cortex-a8"
|
||||
+ LDFLAGS="${LDFLAGS} -march=armv7-a"
|
||||
fi
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not Android" >&5
|
||||
13
recipes/python3/patches/pyconfig_detection.patch
Normal file
13
recipes/python3/patches/pyconfig_detection.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff -Nru Python-3.8.2/Lib/site.py Python-3.8.2-new/Lib/site.py
|
||||
--- Python-3.8.2/Lib/site.py 2020-04-28 12:48:38.000000000 -0700
|
||||
+++ Python-3.8.2-new/Lib/site.py 2020-04-28 12:52:46.000000000 -0700
|
||||
@@ -487,7 +487,8 @@
|
||||
if key == 'include-system-site-packages':
|
||||
system_site = value.lower()
|
||||
elif key == 'home':
|
||||
- sys._home = value
|
||||
+ # this is breaking pyconfig.h path detection with venv
|
||||
+ print('Ignoring "sys._home = value" override')
|
||||
|
||||
sys.prefix = sys.exec_prefix = site_prefix
|
||||
|
||||
13
recipes/python3/patches/reproducible-buildinfo.diff
Normal file
13
recipes/python3/patches/reproducible-buildinfo.diff
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
# DP: Build getbuildinfo.o with DATE/TIME values when defined
|
||||
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -785,6 +785,8 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
|
||||
-DGITVERSION="\"`LC_ALL=C $(GITVERSION)`\"" \
|
||||
-DGITTAG="\"`LC_ALL=C $(GITTAG)`\"" \
|
||||
-DGITBRANCH="\"`LC_ALL=C $(GITBRANCH)`\"" \
|
||||
+ $(if $(BUILD_DATE),-DDATE='"$(BUILD_DATE)"') \
|
||||
+ $(if $(BUILD_TIME),-DTIME='"$(BUILD_TIME)"') \
|
||||
-o $@ $(srcdir)/Modules/getbuildinfo.c
|
||||
|
||||
Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
|
||||
Loading…
Add table
Add a link
Reference in a new issue