From 841c6812db8511012a4a0e0f3a91fd39bfe883e6 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Sat, 22 Feb 2025 12:12:48 +0100 Subject: [PATCH] depends: remove eudev --- contrib/depends/packages/eudev.mk | 25 ------------------------- contrib/depends/packages/hidapi.mk | 5 +++-- contrib/depends/packages/packages.mk | 2 +- contrib/guix/manifest.scm | 1 - monero | 2 +- 5 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 contrib/depends/packages/eudev.mk diff --git a/contrib/depends/packages/eudev.mk b/contrib/depends/packages/eudev.mk deleted file mode 100644 index 7774d965..00000000 --- a/contrib/depends/packages/eudev.mk +++ /dev/null @@ -1,25 +0,0 @@ -package=eudev -$(package)_version=3.2.14 -$(package)_download_path=https://github.com/eudev-project/eudev/releases/download/v$($(package)_version)/ -$(package)_file_name=eudev-$($(package)_version).tar.gz -$(package)_sha256_hash=8da4319102f24abbf7fff5ce9c416af848df163b29590e666d334cc1927f006f - -define $(package)_set_vars - $(package)_config_opts=--disable-gudev --disable-introspection --disable-hwdb --disable-manpages --disable-shared -endef - -define $(package)_config_cmds - $($(package)_autoconf) -endef - -define $(package)_build_cmd - $(MAKE) -endef - -define $(package)_stage_cmds - $(MAKE) DESTDIR=$($(package)_staging_dir) install -endef - -define $(package)_postprocess_cmds - rm lib/*.la -endef diff --git a/contrib/depends/packages/hidapi.mk b/contrib/depends/packages/hidapi.mk index 19ea1cb2..f10954a3 100644 --- a/contrib/depends/packages/hidapi.mk +++ b/contrib/depends/packages/hidapi.mk @@ -3,11 +3,12 @@ $(package)_version=0.14.0 $(package)_download_path=https://github.com/libusb/hidapi/archive/refs/tags $(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_sha256_hash=a5714234abe6e1f53647dd8cba7d69f65f71c558b7896ed218864ffcf405bcbd -$(package)_linux_dependencies=libusb eudev +$(package)_linux_dependencies=libusb $(package)_patches=cmake-fix-libusb.patch define $(package)_set_vars - $(package)_config_opts+=-DBUILD_SHARED_LIBS=OFF + $(package)_config_opts := -DBUILD_SHARED_LIBS=OFF + $(package)_config_opts += -DHIDAPI_WITH_HIDRAW=OFF endef define $(package)_preprocess_cmds diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk index 856c1a5c..95cd7fd7 100644 --- a/contrib/depends/packages/packages.mk +++ b/contrib/depends/packages/packages.mk @@ -1,7 +1,7 @@ packages := boost openssl unbound qrencode libsodium polyseed hidapi abseil protobuf libusb zlib libgpg-error libgcrypt expat libzip zxing-cpp native_packages := native_qt native_abseil native_protobuf -linux_packages := eudev libfuse libsquashfuse zstd appimage_runtime wayland libffi +linux_packages := libfuse libsquashfuse zstd appimage_runtime wayland libffi linux_native_packages := native_expat native_libffi native_wayland x86_64_linux_packages := flatstart diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 6e88106f..f73ed071 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -505,7 +505,6 @@ inspecting signatures in Mach-O binaries.") (list (make-bitcoin-cross-toolchain target) squashfs-tools - gperf ;; used to build eudev in depends zig ;; used to build flatstart in depends )) ((string-contains target "darwin") diff --git a/monero b/monero index 111b3135..91498ad9 160000 --- a/monero +++ b/monero @@ -1 +1 @@ -Subproject commit 111b3135e40e137a75ef99da1685b0fbc47e8ec9 +Subproject commit 91498ad98c61fbf6cfde09576a469831262a579e -- 2.52.0