From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Linus Groh 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 Co-Authored-By: Oskar Skog --- configure | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/configure b/configure index b6f90bcd8c7300cbbe0e2a653c9f39e605e8507f..d05ebfcde44a5159036f4597cfd43553f1da404f 100755 --- a/configure +++ b/configure @@ -4258,6 +4258,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 ;; @@ -4302,6 +4305,7 @@ then linux*) MACHDEP="linux";; cygwin*) MACHDEP="cygwin";; darwin*) MACHDEP="darwin";; + serenityos*) MACHDEP="serenityos";; '') MACHDEP="unknown";; esac fi @@ -4311,6 +4315,9 @@ printf "%s\n" "\"$MACHDEP\"" >&6; } if test "$cross_compiling" = yes; then case "$host" in + *-*-serenity*) + _host_cpu=$host_cpu + ;; *-*-linux*) case "$host_cpu" in arm*) @@ -7488,7 +7495,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}} @@ -12839,7 +12846,7 @@ then else CCSHARED="+z"; fi;; Linux-android*) ;; - Linux*|GNU*) CCSHARED="-fPIC";; + Linux*|GNU*|SerenityOS*) CCSHARED="-fPIC";; Emscripten*|WASI*) if test "x$enable_wasm_dynamic_linking" = xyes then : @@ -12877,7 +12884,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/*) LINKFORSHARED="$extra_undefs -framework CoreFoundation"