RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 06:17:35 +00:00
Code Issues Activity Actions

Ports: Always set Python MACHDEP to version-less 'serenityos'

Browse source 
This is used for `sys.platform`, so it's important to get it right and
ideally never change it again. When not cross-compiling this would
append the `uname -r` version number, so let's explicitly override the
generated value and set it to `serenityos`. Various other systems do
this as well.
This commit is contained in:
Linus Groh 2021-05-06 16:46:43 +01:00
parent 8cfbeb78ff
commit f1791eca13
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ports/python3/patches/ReadMe.md
View file

@ -14,7 +14,7 @@ Disables check for `RLIMIT_CORE` and subsequent `setrlimit()` call. Would be ena
## `fix-autoconf.patch` ## `fix-autoconf.patch`
As usual, make the `configure` script recognize Serenity. As usual, make the `configure` script recognize Serenity. Also set `MACHDEP` (which is used for `sys.platform`) to a version-less `serenityos`, even when not cross-compiling.
## `remove-setlocale-from-preconfig.patch` ## `remove-setlocale-from-preconfig.patch`

26
Ports/python3/patches/fix-autoconf.patch
View file

@ -10,7 +10,7 @@
os=-sysv4 os=-sysv4
;; ;;
--- Python-3.9.5/configure.ac 2021-05-03 15:54:42.000000000 +0100 --- Python-3.9.5/configure.ac 2021-05-03 15:54:42.000000000 +0100
+++ Python-3.9.5/configure.ac 2021-05-06 12:46:42.579733794 +0100 +++ Python-3.9.5/configure.ac 2021-05-06 16:40:34.503092204 +0100
@@ -391,6 +391,9 @@ @@ -391,6 +391,9 @@
# a lot of different things including 'define_xopen_source' # a lot of different things including 'define_xopen_source'
# in the case statement below. # in the case statement below.
@ -21,7 +21,15 @@
*-*-linux-android*) *-*-linux-android*)
ac_sys_system=Linux-android ac_sys_system=Linux-android
;; ;;
@@ -437,6 +440,9 @@ @@ -429,6 +432,7 @@
linux*) MACHDEP="linux";;
cygwin*) MACHDEP="cygwin";;
darwin*) MACHDEP="darwin";;
+ serenityos*) MACHDEP="serenityos";;
'') MACHDEP="unknown";;
esac
fi
@@ -437,6 +441,9 @@
AC_SUBST(_PYTHON_HOST_PLATFORM) AC_SUBST(_PYTHON_HOST_PLATFORM)
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
case "$host" in case "$host" in
@ -32,7 +40,7 @@
case "$host_cpu" in case "$host_cpu" in
arm*) arm*)
--- Python-3.9.5/configure 2021-05-03 15:54:42.000000000 +0100 --- Python-3.9.5/configure 2021-05-03 15:54:42.000000000 +0100
+++ Python-3.9.5/configure 2021-05-06 12:48:56.875043814 +0100 +++ Python-3.9.5/configure 2021-05-06 16:39:39.108339089 +0100
@@ -3295,6 +3295,9 @@ @@ -3295,6 +3295,9 @@
# a lot of different things including 'define_xopen_source' # a lot of different things including 'define_xopen_source'
# in the case statement below. # in the case statement below.
@ -43,7 +51,15 @@
*-*-linux-android*) *-*-linux-android*)
ac_sys_system=Linux-android ac_sys_system=Linux-android
;; ;;
@@ -3342,6 +3345,9 @@ @@ -3333,6 +3336,7 @@
linux*) MACHDEP="linux";;
cygwin*) MACHDEP="cygwin";;
darwin*) MACHDEP="darwin";;
+ serenityos*) MACHDEP="serenityos";;
'') MACHDEP="unknown";;
esac
fi
@@ -3342,6 +3346,9 @@
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
case "$host" in case "$host" in
@ -53,7 +69,7 @@
*-*-linux*) *-*-linux*)
case "$host_cpu" in case "$host_cpu" in
arm*) arm*)
@@ -9646,6 +9652,7 @@ @@ -9646,6 +9653,7 @@
# LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; # LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";; Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";; Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;