Ports: Remove i686 support
This commit is contained in:
Liav A
Andreas Kling
parent
e11dcd21c1
commit
b49c4eb94f
Notes:
sideshowbarker
2024-07-17 03:18:29 +09:00
Author: https://github.com/supercomputer7 Commit: https://github.com/SerenityOS/serenity/commit/b49c4eb94f Pull-request: https://github.com/SerenityOS/serenity/pull/15467 Issue: https://github.com/SerenityOS/serenity/issues/15444 Reviewed-by: https://github.com/ADKaster Reviewed-by: https://github.com/Hendiadyoin1 Reviewed-by: https://github.com/fuel-pcbox
8 changed files with 18 additions and 24 deletions
|
|
@ -26,7 +26,7 @@ configuration/compilation options, and some other things (see
|
|||
script in this directory. This is sometimes required when LibC changes, for
|
||||
example. Pass `clean` as first argument to remove old build files beforehand.
|
||||
|
||||
Installed ports are being tracked in `Build/i686/Root/usr/Ports/packages.db` (a simple text file).
|
||||
Installed ports are being tracked in `Build/x86_64/Root/usr/Ports/packages.db` (a simple text file).
|
||||
You can delete this file at any time, in fact it must be edited or removed
|
||||
when clearing the build directory as port dependencies may not be installed
|
||||
again otherwise.
|
||||
|
|
@ -169,7 +169,7 @@ hash along with the [`files`](#files).
|
|||
Options passed to the port's [`configscript`](#configscript) in the default
|
||||
`configure` function.
|
||||
|
||||
`--host=i686-pc-serenity` is always passed, override the `configure` function
|
||||
`--host=x86_64-pc-serenity` is always passed, override the `configure` function
|
||||
if that's undesirable.
|
||||
|
||||
#### `use_fresh_config_sub`
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@ Subject: [PATCH] Add serenity toolchain information and makefile files
|
|||
|
||||
---
|
||||
build/platform.simulator.serenity.mak | 6 ++++
|
||||
build/toolchain.i686-pc-serenity.mak | 4 +++
|
||||
build/toolchain.x86_64-pc-serenity.mak | 4 +++
|
||||
ion/src/simulator/serenity/Makefile | 43 +++++++++++++++++++++++++++
|
||||
3 files changed, 53 insertions(+)
|
||||
create mode 100644 build/platform.simulator.serenity.mak
|
||||
create mode 100644 build/toolchain.i686-pc-serenity.mak
|
||||
create mode 100644 build/toolchain.x86_64-pc-serenity.mak
|
||||
create mode 100644 ion/src/simulator/serenity/Makefile
|
||||
|
||||
diff --git a/build/platform.simulator.serenity.mak b/build/platform.simulator.serenity.mak
|
||||
|
|
@ -18,19 +18,19 @@ index 0000000..ff985de
|
|||
--- /dev/null
|
||||
+++ b/build/platform.simulator.serenity.mak
|
||||
@@ -0,0 +1,6 @@
|
||||
+TOOLCHAIN = i686-pc-serenity
|
||||
+TOOLCHAIN = x86_64-pc-serenity
|
||||
+EXE = elf
|
||||
+
|
||||
+EPSILON_TELEMETRY ?= 0
|
||||
+
|
||||
+SHOULD_USE_DYNAMIC_SDL = 1
|
||||
diff --git a/build/toolchain.i686-pc-serenity.mak b/build/toolchain.i686-pc-serenity.mak
|
||||
diff --git a/build/toolchain.x86_64-pc-serenity.mak b/build/toolchain.x86_64-pc-serenity.mak
|
||||
new file mode 100644
|
||||
index 0000000..d6110e2
|
||||
--- /dev/null
|
||||
+++ b/build/toolchain.i686-pc-serenity.mak
|
||||
+++ b/build/toolchain.x86_64-pc-serenity.mak
|
||||
@@ -0,0 +1,4 @@
|
||||
+TOOLCHAIN_PREFIX = i686-pc-serenity
|
||||
+TOOLCHAIN_PREFIX = x86_64-pc-serenity
|
||||
+CC = $(TOOLCHAIN_PREFIX)-gcc
|
||||
+CXX = $(TOOLCHAIN_PREFIX)-g++
|
||||
+LD = $(TOOLCHAIN_PREFIX)-g++
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ Date: Wed, 15 Apr 2020 14:23:25 +0100
|
|||
Subject: [PATCH] Don't build the docs and the demo
|
||||
|
||||
- docs - segfault during make :/
|
||||
- demo - i686-pc-serenity-gcc: error: unrecognized command line option '-rdynamic'
|
||||
- demo - x86_64-pc-serenity-gcc: error: unrecognized command line option '-rdynamic'
|
||||
---
|
||||
Makefile.am | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
|
@ -20,7 +20,7 @@ index 9241ce5..1e2f6c6 100644
|
|||
-SUBDIRS = config m4 term src docs man demo tutorial share
|
||||
+# Note: For the SerenityOS port of gnuplot, the following have been removed:
|
||||
+# docs - segfault during make :/
|
||||
+# demo - i686-pc-serenity-gcc: error: unrecognized command line option '-rdynamic'
|
||||
+# demo - x86_64-pc-serenity-gcc: error: unrecognized command line option '-rdynamic'
|
||||
+SUBDIRS = config m4 term src man tutorial share
|
||||
|
||||
EXTRA_DIST = BUGS Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \
|
||||
|
|
|
|||
|
|
@ -5,5 +5,5 @@
|
|||
Don't build the docs and the demo
|
||||
|
||||
- docs - segfault during make :/
|
||||
- demo - i686-pc-serenity-gcc: error: unrecognized command line option '-rdynamic'
|
||||
- demo - x86_64-pc-serenity-gcc: error: unrecognized command line option '-rdynamic'
|
||||
|
||||
|
|
|
|||
|
|
@ -4,17 +4,17 @@ Date: Wed, 14 Apr 2021 04:32:34 +0200
|
|||
Subject: [PATCH] Stub out the gpgrt lock impl
|
||||
|
||||
---
|
||||
src/syscfg/lock-obj-pub.i686-pc-serenity.h | 17 +++++++++++++++++
|
||||
src/syscfg/lock-obj-pub.x86_64-pc-serenity.h | 17 +++++++++++++++++
|
||||
1 file changed, 17 insertions(+)
|
||||
create mode 100644 src/syscfg/lock-obj-pub.i686-pc-serenity.h
|
||||
create mode 100644 src/syscfg/lock-obj-pub.x86_64-pc-serenity.h
|
||||
|
||||
diff --git a/src/syscfg/lock-obj-pub.i686-pc-serenity.h b/src/syscfg/lock-obj-pub.i686-pc-serenity.h
|
||||
diff --git a/src/syscfg/lock-obj-pub.x86_64-pc-serenity.h b/src/syscfg/lock-obj-pub.x86_64-pc-serenity.h
|
||||
new file mode 100644
|
||||
index 0000000..016f396
|
||||
--- /dev/null
|
||||
+++ b/src/syscfg/lock-obj-pub.i686-pc-serenity.h
|
||||
+++ b/src/syscfg/lock-obj-pub.x86_64-pc-serenity.h
|
||||
@@ -0,0 +1,17 @@
|
||||
+## lock-obj-pub.i686-pc-serenity.h - NO LOCK SUPPORT
|
||||
+## lock-obj-pub.x86_64-pc-serenity.h - NO LOCK SUPPORT
|
||||
+## File created by gen-posix-lock-obj - DO NOT EDIT
|
||||
+## To be included by mkheader into gpg-error.h
|
||||
+
|
||||
|
|
|
|||
|
|
@ -15,8 +15,7 @@ index d3404be..809a412 100755
|
|||
cpu_type="x86"
|
||||
newoldwritesample=enabled
|
||||
;;
|
||||
- i686-*-linux*|i686-*-kfreebsd*-gnu)
|
||||
+ i686-*-linux*|i686-*-kfreebsd*-gnu|i686-*-serenity*)
|
||||
i686-*-linux*|i686-*-kfreebsd*-gnu)
|
||||
cpu_type="x86"
|
||||
newoldwritesample=enabled
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -6,9 +6,7 @@ files="https://luajit.org/download/LuaJIT-${version}.tar.gz LuaJIT-${version}.ta
|
|||
auth_type=sha256
|
||||
workdir="LuaJIT-${version}"
|
||||
|
||||
if [ ${SERENITY_ARCH} = "i686" ]; then
|
||||
M_FLAG=-m32
|
||||
elif [ ${SERENITY_ARCH} = "x86_64" ]; then
|
||||
if [ ${SERENITY_ARCH} = "x86_64" ]; then
|
||||
M_FLAG=-m64
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -26,9 +26,6 @@ case "${SERENITY_ARCH}" in
|
|||
x86_64)
|
||||
configopts+=("--with-coroutine=amd64")
|
||||
;;
|
||||
i686)
|
||||
configopts+=("--with-coroutine=x86")
|
||||
;;
|
||||
*)
|
||||
echo "Error: Architecture ${SERENITY_ARCH} is not supported for this port"
|
||||
exit 1
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue