mirror of
https://github.com/SerenityOS/serenity
synced 2026-04-25 17:15:42 +02:00
78 lines
2.5 KiB
Diff
78 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Linus Groh <mail@linusgroh.de>
|
|
Date: Mon, 2 Oct 2023 18:52:35 +0100
|
|
Subject: [PATCH] Tweak configure
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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.
|
|
|
|
Co-Authored-By: Julian Offenhäuser <offenhaeuser@protonmail.com>
|
|
Co-Authored-By: Oskar Skog <oskar@oskog97.com>
|
|
---
|
|
configure | 13 ++++++++++---
|
|
1 file changed, 10 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index 8cfdda5a29b00da362abad11b90767480388aa27..13873c817d5b093c346148a176fc4803c902eb9b 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -4105,6 +4105,9 @@ then
|
|
# a lot of different things including 'define_xopen_source'
|
|
# in the case statement below.
|
|
case "$host" in
|
|
+ *-*-serenity*)
|
|
+ ac_sys_system=SerenityOS
|
|
+ ;;
|
|
*-*-linux-android*)
|
|
ac_sys_system=Linux-android
|
|
;;
|
|
@@ -4157,6 +4160,7 @@ then
|
|
linux*) MACHDEP="linux";;
|
|
cygwin*) MACHDEP="cygwin";;
|
|
darwin*) MACHDEP="darwin";;
|
|
+ serenityos*) MACHDEP="serenityos";;
|
|
'') MACHDEP="unknown";;
|
|
esac
|
|
|
|
@@ -4581,6 +4585,9 @@ fi
|
|
|
|
if test "$cross_compiling" = yes; then
|
|
case "$host" in
|
|
+ *-*-serenity*)
|
|
+ _host_cpu=$host_cpu
|
|
+ ;;
|
|
*-*-linux*)
|
|
case "$host_cpu" in
|
|
arm*)
|
|
@@ -7734,7 +7741,7 @@ printf "%s\n" "#define Py_ENABLE_SHARED 1" >>confdefs.h
|
|
PY3LIBRARY=libpython3.so
|
|
fi
|
|
;;
|
|
- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|VxWorks*)
|
|
+ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|VxWorks*|SerenityOS*)
|
|
LDLIBRARY='libpython$(LDVERSION).so'
|
|
BLDLIBRARY='-L. -lpython$(LDVERSION)'
|
|
RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
|
|
@@ -13716,7 +13723,7 @@ then
|
|
then CCSHARED="-fPIC";
|
|
else CCSHARED="+z";
|
|
fi;;
|
|
- Linux*|GNU*) CCSHARED="-fPIC";;
|
|
+ Linux*|GNU*|SerenityOS*) CCSHARED="-fPIC";;
|
|
Emscripten*|WASI*)
|
|
if test "x$enable_wasm_dynamic_linking" = xyes
|
|
then :
|
|
@@ -13754,7 +13761,7 @@ then
|
|
LINKFORSHARED="-Wl,-E -Wl,+s";;
|
|
# LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
|
|
Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
|
|
- Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
|
|
+ Linux*|GNU*|SerenityOS*) LINKFORSHARED="-Xlinker -export-dynamic";;
|
|
# -u libsys_s pulls in all symbols in libsys
|
|
Darwin/*|iOS/*)
|
|
LINKFORSHARED="$extra_undefs -framework CoreFoundation"
|