mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-11-21 23:20:20 +00:00
Meta+Ports: Automatically generate a meson cross file that we can use
This commit is contained in:
parent
0057b24b9e
commit
fb877effb8
Notes:
sideshowbarker
2024-07-17 08:59:57 +09:00
Author: https://github.com/timschumi Commit: https://github.com/SerenityOS/serenity/commit/fb877effb8 Pull-request: https://github.com/SerenityOS/serenity/pull/14542 Reviewed-by: https://github.com/BertalanD Reviewed-by: https://github.com/linusg ✅
11 changed files with 36 additions and 70 deletions
|
@ -50,6 +50,8 @@ set(SERENITY_TOOLCHAIN_FILE "${SERENITY_BUILD_DIR}/CMakeToolchain.txt" CACHE PAT
|
|||
# Support non-cross builds by stuffing this in a variable
|
||||
set(SERENITY_TOOLCHAIN_FILE_ARG "-DCMAKE_TOOLCHAIN_FILE:STRING=${SERENITY_TOOLCHAIN_FILE}")
|
||||
|
||||
configure_file("${SERENITY_SOURCE_DIR}/Toolchain/CMake/meson-cross-file-${SERENITY_TOOLCHAIN}.txt.in" "${SERENITY_BUILD_DIR}/meson-cross-file.txt" @ONLY)
|
||||
|
||||
# Allow the Ninja generators to output messages as they happen by assigning
|
||||
# these jobs to the 'console' job pool
|
||||
set(console_access "")
|
||||
|
|
2
Ports/glib/.gitignore
vendored
2
Ports/glib/.gitignore
vendored
|
@ -1,2 +0,0 @@
|
|||
!cross_file-i686.txt
|
||||
!cross_file-x86_64.txt
|
|
@ -1,16 +0,0 @@
|
|||
[binaries]
|
||||
c = 'i686-pc-serenity-gcc'
|
||||
cpp = 'i686-pc-serenity-g++'
|
||||
ar = 'i686-pc-serenity-ar'
|
||||
ranlib = 'i686-pc-serenity-ranlib'
|
||||
pkgconfig = 'pkg-config'
|
||||
|
||||
[properties]
|
||||
sys_root = '../../../../Build/i686/Root'
|
||||
needs_exe_wrapper = true
|
||||
|
||||
[host_machine]
|
||||
system = 'serenity'
|
||||
cpu_family = 'x86'
|
||||
cpu = 'i686'
|
||||
endian = 'little'
|
|
@ -1,16 +0,0 @@
|
|||
[binaries]
|
||||
c = 'x86_64-pc-serenity-gcc'
|
||||
cpp = 'x86_64-pc-serenity-g++'
|
||||
ar = 'x86_64-pc-serenity-ar'
|
||||
ranlib = 'x86_64-pc-serenity-ranlib'
|
||||
pkgconfig = 'pkg-config'
|
||||
|
||||
[properties]
|
||||
sys_root = '../../../../Build/x86_64/Root'
|
||||
needs_exe_wrapper = true
|
||||
|
||||
[host_machine]
|
||||
system = 'serenity'
|
||||
cpu_family = 'x86'
|
||||
cpu = 'x86_64'
|
||||
endian = 'little'
|
|
@ -4,7 +4,7 @@ version='2.73.0'
|
|||
files="https://gitlab.gnome.org/GNOME/glib/-/archive/${version}/glib-${version}.tar.gz glib-${version}.tar.gz 3f573319adbdf572d79255e8bae85c7e2902d1aa6177d2646605a00c0a607eca"
|
||||
auth_type='sha256'
|
||||
useconfigure='true'
|
||||
configopts=("--cross-file" "../cross_file-${SERENITY_ARCH}.txt")
|
||||
configopts=("--cross-file" "${SERENITY_BUILD_DIR}/meson-cross-file.txt")
|
||||
depends=("libiconv" "libffi" "zlib" "gettext" "pcre")
|
||||
|
||||
configure() {
|
||||
|
|
2
Ports/powdertoy/.gitignore
vendored
2
Ports/powdertoy/.gitignore
vendored
|
@ -1,2 +0,0 @@
|
|||
!cross_file-i686.txt
|
||||
!cross_file-x86_64.txt
|
|
@ -1,16 +0,0 @@
|
|||
[binaries]
|
||||
c = 'i686-pc-serenity-gcc'
|
||||
cpp = 'i686-pc-serenity-g++'
|
||||
ar = 'i686-pc-serenity-ar'
|
||||
ranlib = 'i686-pc-serenity-ranlib'
|
||||
pkgconfig = 'pkg-config'
|
||||
|
||||
[properties]
|
||||
sys_root = '../../../../Build/i686/Root'
|
||||
needs_exe_wrapper = true
|
||||
|
||||
[host_machine]
|
||||
system = 'serenity'
|
||||
cpu_family = 'x86'
|
||||
cpu = 'i686'
|
||||
endian = 'little'
|
|
@ -1,16 +0,0 @@
|
|||
[binaries]
|
||||
c = 'x86_64-pc-serenity-gcc'
|
||||
cpp = 'x86_64-pc-serenity-g++'
|
||||
ar = 'x86_64-pc-serenity-ar'
|
||||
ranlib = 'x86_64-pc-serenity-ranlib'
|
||||
pkgconfig = 'pkg-config'
|
||||
|
||||
[properties]
|
||||
sys_root = '../../../../Build/x86_64/Root'
|
||||
needs_exe_wrapper = true
|
||||
|
||||
[host_machine]
|
||||
system = 'serenity'
|
||||
cpu_family = 'x86'
|
||||
cpu = 'x86_64'
|
||||
endian = 'little'
|
|
@ -2,7 +2,7 @@
|
|||
port=powdertoy
|
||||
version=96.2.350
|
||||
useconfigure=true
|
||||
configopts=("-Dbuildtype=release" "build-release" "--cross-file" "../cross_file-${SERENITY_ARCH}.txt")
|
||||
configopts=("-Dbuildtype=release" "build-release" "--cross-file" "${SERENITY_BUILD_DIR}/meson-cross-file.txt")
|
||||
depends=("luajit" "curl" "libfftw3f" "zlib" "SDL2")
|
||||
files="https://github.com/The-Powder-Toy/The-Powder-Toy/archive/refs/tags/v${version}.tar.gz The-Powder-Toy-${version}.tar.gz d95cbadee22632687661e8fc488bd64405d81c0dca737e16420f26e93ea5bf58"
|
||||
auth_type=sha256
|
||||
|
|
16
Toolchain/CMake/meson-cross-file-Clang.txt.in
Normal file
16
Toolchain/CMake/meson-cross-file-Clang.txt.in
Normal file
|
@ -0,0 +1,16 @@
|
|||
[binaries]
|
||||
c = '@SERENITY_ARCH@-pc-serenity-clang'
|
||||
cpp = '@SERENITY_ARCH@-pc-serenity-clang++'
|
||||
ar = 'llvm-ar'
|
||||
ranlib = 'llvm-ranlib'
|
||||
pkgconfig = 'pkg-config'
|
||||
|
||||
[properties]
|
||||
sys_root = '@SERENITY_BUILD_DIR@/Root'
|
||||
needs_exe_wrapper = true
|
||||
|
||||
[host_machine]
|
||||
system = 'serenity'
|
||||
cpu_family = 'x86'
|
||||
cpu = '@SERENITY_ARCH@'
|
||||
endian = 'little'
|
16
Toolchain/CMake/meson-cross-file-GNU.txt.in
Normal file
16
Toolchain/CMake/meson-cross-file-GNU.txt.in
Normal file
|
@ -0,0 +1,16 @@
|
|||
[binaries]
|
||||
c = '@SERENITY_ARCH@-pc-serenity-gcc'
|
||||
cpp = '@SERENITY_ARCH@-pc-serenity-g++'
|
||||
ar = '@SERENITY_ARCH@-pc-serenity-ar'
|
||||
ranlib = '@SERENITY_ARCH@-pc-serenity-ranlib'
|
||||
pkgconfig = 'pkg-config'
|
||||
|
||||
[properties]
|
||||
sys_root = '@SERENITY_BUILD_DIR@/Root'
|
||||
needs_exe_wrapper = true
|
||||
|
||||
[host_machine]
|
||||
system = 'serenity'
|
||||
cpu_family = 'x86'
|
||||
cpu = '@SERENITY_ARCH@'
|
||||
endian = 'little'
|
Loading…
Reference in a new issue