From 7145610b9e0da0ff5482d841f8e47ef8d3eb43d6 Mon Sep 17 00:00:00 2001 From: fuzzard Date: Sat, 12 Feb 2022 18:14:10 +1000 Subject: [tools/depends][target] bump fribidi 1.0.11 --- tools/depends/target/fribidi/FRIBIDI-VERSION | 5 +++++ tools/depends/target/fribidi/Makefile | 15 +++------------ 2 files changed, 8 insertions(+), 12 deletions(-) create mode 100644 tools/depends/target/fribidi/FRIBIDI-VERSION (limited to 'tools/depends') diff --git a/tools/depends/target/fribidi/FRIBIDI-VERSION b/tools/depends/target/fribidi/FRIBIDI-VERSION new file mode 100644 index 0000000000..2f1bcbdda1 --- /dev/null +++ b/tools/depends/target/fribidi/FRIBIDI-VERSION @@ -0,0 +1,5 @@ +LIBNAME=fribidi +VERSION=1.0.11 +SOURCE=$(LIBNAME)-$(VERSION) +ARCHIVE=$(SOURCE).tar.xz +SHA512=6afde86784de06759f18235ccb44f23261a975f7cce0021b16755065a6a8ed84d7d5fb7fdcaadd691b48011efb4bfc2ee67555e5133a294a418cca1a0c85476c diff --git a/tools/depends/target/fribidi/Makefile b/tools/depends/target/fribidi/Makefile index 43171e5eae..2545089933 100644 --- a/tools/depends/target/fribidi/Makefile +++ b/tools/depends/target/fribidi/Makefile @@ -1,13 +1,5 @@ -include ../../Makefile.include -DEPS = ../../Makefile.include Makefile ../../download-files.include - -# lib name, version -LIBNAME=fribidi -VERSION=1.0.10 -SOURCE=$(LIBNAME)-$(VERSION) -ARCHIVE=$(SOURCE).tar.gz -SHA512=f4eca4eb4afad6953eccc73d094202e8cd159674005ab3c27a51b4c42210ae4192c7c8093c1e653a671bb809455f5312aa09db70658c6e526da011cb070b8485 -include ../../download-files.include +include ../../Makefile.include FRIBIDI-VERSION ../../download-files.include +DEPS = ../../Makefile.include Makefile FRIBIDI-VERSION ../../download-files.include MESON_BUILD_TYPE=release @@ -19,12 +11,12 @@ endif CONFIGURE = $(NATIVEPREFIX)/bin/python3 $(NATIVEPREFIX)/bin/meson \ --buildtype=$(MESON_BUILD_TYPE) \ --prefix=$(PREFIX) \ + --cross-file $(PREFIX)/share/cross-file.meson \ -Ddocs=false \ -Dtests=false \ -Dbin=false \ -Ddefault_library=static -CONFIGURE += --cross-file $(PREFIX)/share/cross-file.meson export CC_FOR_BUILD export CFLAGS_FOR_BUILD = $(NATIVE_CFLAGS) export LDFLAGS_FOR_BUILD = $(NATIVE_LDFLAGS) @@ -35,7 +27,6 @@ LIBDYLIB=$(PLATFORM)/build/lib/lib$(LIBNAME).a all: .installed-$(PLATFORM) - $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) -- cgit v1.2.3