diff --git a/contrib/depends/packages/libXau.mk b/contrib/depends/packages/libXau.mk index fba1234..59a117b 100644 --- a/contrib/depends/packages/libXau.mk +++ b/contrib/depends/packages/libXau.mk @@ -1,34 +1,33 @@ package=libXau -$(package)_version=1.0.11 +$(package)_version=1.0.12 $(package)_download_path=https://xorg.freedesktop.org/releases/individual/lib/ -$(package)_file_name=libXau-$($(package)_version).tar.xz -$(package)_sha256_hash=f3fa3282f5570c3f6bd620244438dbfbdd580fc80f02f549587a0f8ab329bbeb +$(package)_file_name=libXau-$($(package)_version).tar.gz +$(package)_sha256_hash=2402dd938da4d0a332349ab3d3586606175e19cb32cb9fe013c19f1dc922dcee $(package)_dependencies=xorgproto - -# When updating this package, check the default value of -# --disable-xthreads. It is currently enabled. -define $(package)_set_vars - $(package)_config_opts=--disable-shared --disable-lint-library --without-lint - $(package)_config_opts += --disable-dependency-tracking --enable-option-checking - $(package)_config_opts += --with-pic -endef +$(package)_patches=toolchain.txt define $(package)_preprocess_cmds - cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . + rm Makefile.in aclocal.m4 compile config.guess config.h.in config.sub configure depcomp \ + install-sh ltmain.sh missing test-driver man/Makefile.in && \ + rm -rf m4 && \ + cp $($(package)_patch_dir)/toolchain.txt toolchain.txt && \ + sed -i -e 's|@host_prefix@|$(host_prefix)|' \ + -e 's|@cc@|$($(package)_cc)|' \ + -e 's|@cxx@|$($(package)_cxx)|' \ + -e 's|@ar@|$($(package)_ar)|' \ + -e 's|@strip@|$(host_STRIP)|' \ + -e 's|@arch@|$(host_arch)|' \ + toolchain.txt endef define $(package)_config_cmds - $($(package)_autoconf) + meson setup --cross-file toolchain.txt build endef define $(package)_build_cmds - $(MAKE) + ninja -C build endef define $(package)_stage_cmds - $(MAKE) DESTDIR=$($(package)_staging_dir) install -endef - -define $(package)_postprocess_cmds - rm -rf share lib/*.la + DESTDIR=$($(package)_staging_dir) ninja -C build install endef diff --git a/contrib/depends/patches/libXau/toolchain.txt b/contrib/depends/patches/libXau/toolchain.txt new file mode 100644 index 0000000..08ed8ff --- /dev/null +++ b/contrib/depends/patches/libXau/toolchain.txt @@ -0,0 +1,17 @@ +[binaries] +c = '@cc@' +cpp = '@cxx@' +ar = '@ar@' +strip = '@strip@' +pkgconfig = '/home/user/.guix-profile/bin/pkg-config' + +[host_machine] +system = 'linux' +cpu_family = '@arch@' +cpu = '@arch@' +endian = 'little' + +[built-in options] +default_library = 'static' +prefer_static = true +prefix = '@host_prefix@'