diff --git a/packages/wayland/wayland/package.mk b/packages/wayland/wayland/package.mk index 40f472dbcd..011375be72 100644 --- a/packages/wayland/wayland/package.mk +++ b/packages/wayland/wayland/package.mk @@ -7,33 +7,25 @@ PKG_SHA256="baccd902300d354581cd5ad3cc49daa4921d55fb416a5883e218750fef166d15" PKG_LICENSE="OSS" PKG_SITE="https://wayland.freedesktop.org/" PKG_URL="https://wayland.freedesktop.org/releases/${PKG_NAME}-${PKG_VERSION}.tar.xz" -PKG_DEPENDS_TARGET="toolchain wayland:host libffi expat libxml2" PKG_DEPENDS_HOST="libffi:host expat:host libxml2:host" +PKG_DEPENDS_TARGET="toolchain wayland:host libffi expat libxml2" PKG_LONGDESC="a display server protocol" -PKG_TOOLCHAIN="configure" -PKG_CONFIGURE_OPTS_HOST="--enable-shared \ - --disable-static \ - --disable-libraries \ - --disable-documentation \ - --with-gnu-ld" +PKG_MESON_OPTS_HOST="-Dlibraries=false \ + -Dscanner=true \ + -Ddocumentation=false \ + -Ddtd_validation=false" -PKG_CONFIGURE_OPTS_TARGET="--with-sysroot=${SYSROOT_PREFIX} \ - --with-host-scanner \ - --enable-shared \ - --disable-static \ - --enable-libraries \ - --disable-documentation \ - --with-gnu-ld" +PKG_MESON_OPTS_TARGET="-Dlibraries=true \ + -Dscanner=false \ + -Ddocumentation=false \ + -Ddtd_validation=false" pre_configure_target() { # wayland does not build with NDEBUG (requires assert for tests) - export CFLAGS=$(echo ${CFLAGS} | sed -e "s|-DNDEBUG||g") + export TARGET_CFLAGS=$(echo ${TARGET_CFLAGS} | sed -e "s|-DNDEBUG||g") } -post_makeinstall_target() { - rm -rf ${INSTALL}/usr/bin - rm -rf ${INSTALL}/usr/share - +post_makeinstall_host() { cp ${TOOLCHAIN}/lib/pkgconfig/wayland-scanner.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig/ } diff --git a/packages/wayland/wayland/patches/wayland-100.01-fix-wayland-scanner-build.patch b/packages/wayland/wayland/patches/wayland-100.01-fix-wayland-scanner-build.patch new file mode 100644 index 0000000000..4ccba193b6 --- /dev/null +++ b/packages/wayland/wayland/patches/wayland-100.01-fix-wayland-scanner-build.patch @@ -0,0 +1,12 @@ +--- /src/meson.build ++++ /src/meson.build +@@ -58,7 +58,7 @@ + ) + endif + +-if meson.is_cross_build() or not get_option('scanner') ++if meson.is_cross_build() and get_option('libraries') + scanner_dep = dependency('wayland-scanner', native: true, version: meson.project_version()) + wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner')) + else +