From b49c4eb94f27f8ad67a16c6a58003de33a9d5f2b Mon Sep 17 00:00:00 2001 From: Liav A Date: Tue, 4 Oct 2022 02:57:03 +0300 Subject: [PATCH] Ports: Remove i686 support --- Ports/README.md | 4 ++-- ...ity-toolchain-information-and-makefile-file.patch | 12 ++++++------ .../0001-Don-t-build-the-docs-and-the-demo.patch | 4 ++-- Ports/gnuplot/patches/ReadMe.md | 2 +- .../patches/0002-Stub-out-the-gpgrt-lock-impl.patch | 10 +++++----- ...-multiple-configure-files-that-serenity-is-.patch | 3 +-- Ports/luajit/package.sh | 4 +--- Ports/ruby/package.sh | 3 --- 8 files changed, 18 insertions(+), 24 deletions(-) diff --git a/Ports/README.md b/Ports/README.md index 7898c48415e..4aac5498f9f 100644 --- a/Ports/README.md +++ b/Ports/README.md @@ -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` diff --git a/Ports/epsilon/patches/0001-Add-serenity-toolchain-information-and-makefile-file.patch b/Ports/epsilon/patches/0001-Add-serenity-toolchain-information-and-makefile-file.patch index 463ee4d68d7..9825fa2262e 100644 --- a/Ports/epsilon/patches/0001-Add-serenity-toolchain-information-and-makefile-file.patch +++ b/Ports/epsilon/patches/0001-Add-serenity-toolchain-information-and-makefile-file.patch @@ -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++ diff --git a/Ports/gnuplot/patches/0001-Don-t-build-the-docs-and-the-demo.patch b/Ports/gnuplot/patches/0001-Don-t-build-the-docs-and-the-demo.patch index 0ae0d7be7ca..bcda0f54e9b 100644 --- a/Ports/gnuplot/patches/0001-Don-t-build-the-docs-and-the-demo.patch +++ b/Ports/gnuplot/patches/0001-Don-t-build-the-docs-and-the-demo.patch @@ -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 \ diff --git a/Ports/gnuplot/patches/ReadMe.md b/Ports/gnuplot/patches/ReadMe.md index b50a02835d4..acec350ceda 100644 --- a/Ports/gnuplot/patches/ReadMe.md +++ b/Ports/gnuplot/patches/ReadMe.md @@ -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' diff --git a/Ports/libgpg-error/patches/0002-Stub-out-the-gpgrt-lock-impl.patch b/Ports/libgpg-error/patches/0002-Stub-out-the-gpgrt-lock-impl.patch index d704e3d4687..8a37cc1864e 100644 --- a/Ports/libgpg-error/patches/0002-Stub-out-the-gpgrt-lock-impl.patch +++ b/Ports/libgpg-error/patches/0002-Stub-out-the-gpgrt-lock-impl.patch @@ -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 + diff --git a/Ports/libmpg123/patches/0001-Teach-the-multiple-configure-files-that-serenity-is-.patch b/Ports/libmpg123/patches/0001-Teach-the-multiple-configure-files-that-serenity-is-.patch index 0eb2ffec8eb..70612d53687 100644 --- a/Ports/libmpg123/patches/0001-Teach-the-multiple-configure-files-that-serenity-is-.patch +++ b/Ports/libmpg123/patches/0001-Teach-the-multiple-configure-files-that-serenity-is-.patch @@ -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 ;; diff --git a/Ports/luajit/package.sh b/Ports/luajit/package.sh index ddee7f81be1..5cc8baf8f3b 100755 --- a/Ports/luajit/package.sh +++ b/Ports/luajit/package.sh @@ -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 diff --git a/Ports/ruby/package.sh b/Ports/ruby/package.sh index 58ee779743a..d324d5c4efd 100755 --- a/Ports/ruby/package.sh +++ b/Ports/ruby/package.sh @@ -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