From b6c07190a62dd2e570bb9c5a0181588bd83d4650 Mon Sep 17 00:00:00 2001 From: Bart Janssens Date: Wed, 20 Sep 2023 13:50:09 +0200 Subject: [PATCH] [Wayland] Add FreeBSD platform (#7381) --- W/Wayland/build_tarballs.jl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/W/Wayland/build_tarballs.jl b/W/Wayland/build_tarballs.jl index 917489c3eae..4d57970585b 100644 --- a/W/Wayland/build_tarballs.jl +++ b/W/Wayland/build_tarballs.jl @@ -15,8 +15,8 @@ sources = [ script = raw""" cd $WORKSPACE/srcdir/wayland-*/ -# We need to run `wayland-scanner` of the same version on the host system -apk add wayland-dev --repository=http://dl-cdn.alpinelinux.org/alpine/v3.17/main +ln -s `which wayland-scanner` $bindir +cp $prefix/libdata/pkgconfig/* $prefix/lib/pkgconfig || true mkdir build-wayland @@ -26,11 +26,12 @@ meson .. \ -Ddocumentation=false ninja -j${nproc} ninja install +rm -f $prefix/lib/pkgconfig/epoll-shim*.pc """ # These are the platforms we will build for by default, unless further # platforms are passed in on the command line -platforms = filter!(Sys.islinux, supported_platforms(; experimental=true)) +platforms = filter(p -> arch(p) != "armv6l" && (Sys.islinux(p) || Sys.isfreebsd(p)), supported_platforms()) # The products that we will ensure are always built products = [ @@ -46,6 +47,8 @@ dependencies = [ Dependency("Expat_jll"; compat="2.2.10"), Dependency("Libffi_jll"; compat="~3.2.2"), Dependency("XML2_jll"), + Dependency("EpollShim_jll"), + HostBuildDependency("Wayland_jll"), ] # Build the tarballs.