From f02b1a687e4dbb88f18b352065133e032cd901a8 Mon Sep 17 00:00:00 2001 From: fuzzard Date: Sun, 22 Oct 2023 20:19:29 +1000 Subject: [tools/depends] Bump wayland 1.22.0 --- tools/depends/native/wayland-scanner/Makefile | 37 ++++++++++++++++----------- 1 file changed, 22 insertions(+), 15 deletions(-) (limited to 'tools/depends/native/wayland-scanner/Makefile') diff --git a/tools/depends/native/wayland-scanner/Makefile b/tools/depends/native/wayland-scanner/Makefile index 2cbf8d51c1..fc71bb30c0 100644 --- a/tools/depends/native/wayland-scanner/Makefile +++ b/tools/depends/native/wayland-scanner/Makefile @@ -1,30 +1,37 @@ -include ../../Makefile.include +include ../../Makefile.include WAYLAND-SCANNER-VERSION ../../download-files.include PREFIX=$(NATIVEPREFIX) PLATFORM=$(NATIVEPLATFORM) -DEPS =../../Makefile.include Makefile ../../download-files.include - -APPNAME=wayland-scanner -PROJECTNAME=wayland -VERSION=1.17.0 -SOURCE=$(PROJECTNAME)-$(VERSION) -ARCHIVE=$(SOURCE).tar.xz -SHA512=c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946 -include ../../download-files.include +DEPS =../../Makefile.include Makefile WAYLAND-SCANNER-VERSION ../../download-files.include # configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --disable-libraries --disable-documentation --disable-dtd-validation +CONFIGURE = $(NATIVEPREFIX)/bin/python3 $(NATIVEPREFIX)/bin/meson setup \ + --prefix $(PREFIX) \ + --libdir $(PREFIX)/lib \ + --buildtype=release \ + -Dlibraries=false \ + -Dtests=false \ + -Ddocumentation=false \ + -Ddtd_validation=false + +export CC=$(CC_BINARY_FOR_BUILD) +export CXX=$(CXX_BINARY_FOR_BUILD) +export CFLAGS=$(NATIVE_CFLAGS) +export CXXFLAGS=$(NATIVE_CXXFLAGS) +export LDFLAGS=$(NATIVE_LDFLAGS) + +export PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig all: .installed-$(PLATFORM) - $(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); $(CONFIGURE) + cd $(PLATFORM); rm -rf build; mkdir -p build + cd $(PLATFORM); $(CONFIGURE) . build .installed-$(PLATFORM): $(PLATFORM) - $(MAKE) -C $(PLATFORM) - $(MAKE) -C $(PLATFORM) install + cd $(PLATFORM)/build; $(NATIVEPREFIX)/bin/ninja -v + cd $(PLATFORM)/build; $(NATIVEPREFIX)/bin/ninja -v install touch $@ clean: -- cgit v1.2.3