Ports: Use new CMakeToolchain.txt located in the build directory

Now that we're generating the CMake toolchain file in the build
directory, we need to redirect the ports that use CMake to the new
location. Looking into this showed that there's still a bunch of work to
do in general to make the ports agnostic to which toolchain they're
using, there's a lot of hard-coded ${ARCH}-pc-serenity-gcc assumptions
still here.
This commit is contained in:
Andrew Kaster 2021-08-19 22:33:06 -06:00 committed by Ali Mohammad Pur
parent b9e3647e66
commit 9dff6acc55
Notes: sideshowbarker 2024-07-18 03:55:40 +09:00
25 changed files with 25 additions and 25 deletions

View file

@ -4,7 +4,7 @@ useconfigure=true
version=git
depends="SDL2 zlib"
workdir=Another-World-Bytecode-Interpreter-master
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_SOURCE_DIR}/Toolchain/CMake/CMakeToolchain.txt -DSDL2_INCLUDE_DIR=${SERENITY_INSTALL_ROOT}/usr/local/include/SDL2"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt -DSDL2_INCLUDE_DIR=${SERENITY_INSTALL_ROOT}/usr/local/include/SDL2"
files="https://github.com/fabiensanglard/Another-World-Bytecode-Interpreter/archive/refs/heads/master.zip master.zip 326de7622e5f83a83fce76e6032240157a9dde83c0d65319095c7e0b312af317"
auth_type=sha256
launcher_name="Another World"

View file

@ -4,7 +4,7 @@ version=git
workdir=SDL-main-serenity
useconfigure=true
files="https://github.com/SerenityPorts/SDL/archive/main-serenity.tar.gz SDL2-git.tar.gz"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_SOURCE_DIR}/Toolchain/CMake/CMakeToolchain.txt -DPULSEAUDIO=OFF -DJACK=OFF"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt -DPULSEAUDIO=OFF -DJACK=OFF"
configure() {
run cmake $configopts

View file

@ -4,7 +4,7 @@ useconfigure=true
version=git
depends="SDL2 SDL2_image"
workdir=SDLPoP-86988c668eeaa10f218e1d4938fc5b4e42314d68
configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
files="https://github.com/NagyD/SDLPoP/archive/86988c668eeaa10f218e1d4938fc5b4e42314d68.zip PoP.zip d18cae8541fb8cbcc374fd998316993d561429a83f92061bc0754337ada774c5"
auth_type=sha256
launcher_name="Prince of Persia"

View file

@ -4,7 +4,7 @@ useconfigure=true
version=git
depends="SDL2 SDL2_mixer SDL2_image"
workdir=Super-Mario-Clone-Cpp-master
configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
files="https://github.com/Bennyhwanggggg/Super-Mario-Clone-Cpp/archive/refs/heads/master.zip master.zip fcacc15d3b5afccb3227f982d3e05f2cfeb198f0fffd008fdcda005cb7f87f91"
auth_type=sha256
launcher_name="Super Mario"

View file

@ -4,7 +4,7 @@ version=c094d64570c30c70f4003e9428d31a2a0d9d3d41
useconfigure=true
files="https://github.com/vkoskiv/c-ray/archive/${version}.tar.gz ${version}.tar.gz 1e0663a1d83e8a9984aced33b9307471f3302c8a5ea7ec47954854d60902a747"
auth_type=sha256
configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
depends="SDL2"
workdir="${port}-${version}"

View file

@ -4,7 +4,7 @@ useconfigure=true
version=git
depends="SDL2"
workdir=chester-public
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_SOURCE_DIR}/Toolchain/CMake/CMakeToolchain.txt"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
files="https://github.com/veikkos/chester/archive/public.tar.gz chester.tar.gz b3ea7ad40608e1050fa434258f5c69b93e7bad10523c4c4a86fe08d1442a907b"
auth_type=sha256

View file

@ -5,7 +5,7 @@ useconfigure=true
files="https://github.com/Kitware/CMake/releases/download/v$version/cmake-$version.tar.gz cmake-$version.tar.gz 7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1"
auth_type=sha256
depends="bash make sed ncurses libuv"
configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=1 -GNinja"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=1 -GNinja"
configure() {
run cmake $configopts .

View file

@ -4,7 +4,7 @@ useconfigure=true
version=git
depends="ncurses"
workdir=cmatrix-master
configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
files="https://github.com/abishekvashok/cmatrix/archive/refs/heads/master.zip cmatrix.zip c32ca7562e58fb1fd7a96ebdfbe51c5de060709d39b67fce3c0bc42547e0ccb2"
auth_type=sha256
launcher_name=cmatrix

View file

@ -4,7 +4,7 @@ version=1.1-beta
useconfigure=true
files="https://github.com/Rapiz1/DungeonRush/archive/refs/tags/v${version}.tar.gz v${version}.tar.gz 295b83cb023bf5d21318992daee125399892bdf16a87c835dfc90b841c929eda"
auth_type=sha256
configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
depends="SDL2 SDL2_image SDL2_mixer SDL2_ttf SDL2_net"
launcher_name="DungeonRush"
launcher_category=Games

View file

@ -7,7 +7,7 @@ files="https://github.com/google/flatbuffers/archive/refs/tags/v${version}.tar.g
useconfigure=true
# Since we are cross-compiling, we cannot build the tests, because we need
# the flatbuffers compiler to build them
configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt -DFLATBUFFERS_BUILD_TESTS=off"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt -DFLATBUFFERS_BUILD_TESTS=off"
configure() {
run cmake $configopts

View file

@ -4,7 +4,7 @@ version=3bf6f7cd893db3451019d6e18a2d9ad1de0e7c8c
useconfigure=true
files="https://github.com/rasky/genemu/archive/${version}.tar.gz genemu-${version}.tar.gz 07e4f6aba1778143796bc0a571dfc7a693a2cbc5cf303a31df19d74e12f8cf54"
auth_type=sha256
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_SOURCE_DIR}/Toolchain/CMake/CMakeToolchain.txt"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
depends="SDL2"
configure() {

View file

@ -3,7 +3,7 @@ port=harfbuzz
useconfigure=true
version=2.8.1
depends="freetype libicu"
configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt -DHB_HAVE_FREETYPE=ON -DHB_HAVE_ICU=ON"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt -DHB_HAVE_FREETYPE=ON -DHB_HAVE_ICU=ON"
files="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz harfbuzz-${version}.tar.xz 4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300"
auth_type=sha256

View file

@ -5,7 +5,7 @@ version=2.4.0-devel
depends="SDL2 zlib"
commit=353379e1f8a847cc0e284541d2b40fd49d175d22
workdir="${port}-${commit}"
configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
files="https://github.com/hatari/hatari/archive/${commit}.tar.gz ${commit}.tar.gz 617f95b30c4e590bb61ddcc1dafc22f4bf270377caa7aa5867f3f7413250b538"
auth_type=sha256
launcher_name=Hatari

View file

@ -4,7 +4,7 @@ useconfigure=true
version=1.21.1
workdir="openal-soft-${version}"
depends=ffmpeg
configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
files="https://openal-soft.org/openal-releases/openal-soft-${version}.tar.bz2 openal-soft-${version}.tar.bz2 c8ad767e9a3230df66756a21cc8ebf218a9d47288f2514014832204e666af5d8"
auth_type=sha256

View file

@ -3,7 +3,7 @@ port=libphysfs
useconfigure=true
version=3.0.2
workdir="physfs-${version}"
configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
files="https://icculus.org/physfs/downloads/physfs-${version}.tar.bz2 physfs-${version}.tar.bz2 304df76206d633df5360e738b138c94e82ccf086e50ba84f456d3f8432f9f863"
auth_type=sha256

View file

@ -4,7 +4,7 @@ version=b12699b1efabfd241324f4ab6cfd6ce576db491e
useconfigure=true
files="https://github.com/libuv/libuv/archive/$version.tar.gz $port-$version.tar.gz bbbfa2bb50437047efc8fb29c243c914ae0de94107d7cc641c2f84e292904eb5"
auth_type=sha256
configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt -GNinja"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt -GNinja"
configure() {
run cmake $configopts .

View file

@ -4,7 +4,7 @@ useconfigure=true
version=1.7.3
depends="zlib"
workdir=libzip-${version}
configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
files="https://libzip.org/download/libzip-${version}.tar.gz libzip-${version}.tar.gz 0e2276c550c5a310d4ebf3a2c3dfc43fb3b4602a072ff625842ad4f3238cb9cc"
auth_type=sha256

View file

@ -3,7 +3,7 @@ port=llvm
useconfigure=true
version=12.0.0
workdir=llvm-project-llvmorg-${version}
configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
files="https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-${version}.zip llvm.zip f77723b70a5d4ab14899feda87d6cf601612165899abb2f6c7b670e517f45e2d"
auth_type=sha256

View file

@ -5,7 +5,7 @@ workdir=MilkyTracker-$version
useconfigure=true
files="https://github.com/milkytracker/MilkyTracker/archive/v$version.tar.gz MilkyTracker-$version.tar.gz 72d5357e303380b52383b66b51f944a77cd77e2b3bfeb227d87cc0e72ab292f7"
auth_type=sha256
configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMake/CMakeToolchain.txt"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
depends="SDL2 zlib"
launcher_name="MilkyTracker"
launcher_category=Sound

View file

@ -5,7 +5,7 @@ auth_type=sha256
depends="freetype SDL2 libicu libpng zlib xz openttd-opengfx openttd-opensfx"
files="https://cdn.openttd.org/openttd-releases/${version}/openttd-${version}-source.tar.xz openttd-${version}.tar.xz 5e65184e07368ba1afa62dbb3e35abaee6c4da6730ff4bc9eb4447d53363c7a8"
useconfigure=true
configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMake/CMakeToolchain.txt"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
launcher_name=OpenTTD
launcher_category=Games
launcher_command=/usr/local/games/openttd

View file

@ -4,7 +4,7 @@ version=84b820f852f3f6b812b4d00d6b3906adbbf3bbdb
useconfigure=true
files="https://github.com/opentyrian/opentyrian/archive/${version}.tar.gz ${version}.tar.gz 7429cc8e3468e3462b886cb99fe6cc0f5d232c193b68a94dc427493107c30dec"
auth_type=sha256
configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
depends="SDL2 opentyrian-data"
launcher_name=OpenTyrian

View file

@ -5,7 +5,7 @@ version="17.04"
useconfigure=true
auth_type=sha256
files="https://github.com/jinfeihan57/p7zip/archive/refs/tags/v${version}.tar.gz p7zip-${version}.tar.gz ea029a2e21d2d6ad0a156f6679bd66836204aa78148a4c5e498fe682e77127ef"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_SOURCE_DIR}/Toolchain/CMake/CMakeToolchain.txt"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
workdir=$port-$version/CPP
post_fetch() {

View file

@ -4,7 +4,7 @@ version=1.28
useconfigure=true
files="https://github.com/8bitbubsy/pt2-clone/archive/v${version}.tar.gz v${version}.tar.gz a3ce83e326d94f1abf6dd75fb788fe508922818c08e6f988155df9ed288f180e"
auth_type=sha256
configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
depends="SDL2"
configure() {

View file

@ -5,7 +5,7 @@ workdir=SerenityQuakeII-master
useconfigure=true
files="https://github.com/SerenityPorts/SerenityQuakeII/archive/master.tar.gz quake2.tar.gz"
makeopts=""
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_SOURCE_DIR}/Toolchain/CMake/CMakeToolchain.txt"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
depends=SDL2
launcher_name=QuakeII
launcher_category=Games

View file

@ -3,7 +3,7 @@ port=SimonTathamsPuzzles
useconfigure=true
version=git
workdir=stpuzzles-main
configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt"
configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
files="https://github.com/SerenityPorts/stpuzzles/archive/refs/heads/main.zip stpuzzles.zip"
configure() {