From e2224cbf8a44c3f3402aab13d736b5c97d712772 Mon Sep 17 00:00:00 2001 From: Konstantin Akimov Date: Tue, 7 Feb 2023 22:31:20 +0700 Subject: [PATCH] build: remove cmake from list of packages (#5179) ## Issue being fixed or feature implemented Seems as `cmake` package is not needed anymore so far as `immer` moved inside src/ directory. `immer` is integrated to our Makefile.am and do not requires extra call of cmake as it used to be. ## What was done? Removed cmake from list of packages and removed package `cmake.mk` ## How Has This Been Tested? Tested build with HEAD - succeed. After that reverted to the old revision that have `immer` package (85d6cadbfad77844a393e4db3dc71ed6a5234c8b). Failed as expected: ``` make: *** No rule to make target 'cmake', needed by '/home/knst/projects/dash/depends/built/x86_64-pc-linux-gnu/bls-dash/bls-dash-1.2.0-6213882c069.tar.gz'. Stop. ``` ## Breaking Changes No breaking changes ## Checklist: - [x] I have performed a self-review of my own code - [x] I have assigned this pull request to a milestone --------- Co-authored-by: UdjinM6 --- depends/README.md | 4 ++-- depends/packages/cmake.mk | 19 ------------------- depends/packages/native_libdmg-hfsplus.mk | 3 +-- depends/packages/packages.mk | 2 +- 4 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 depends/packages/cmake.mk diff --git a/depends/README.md b/depends/README.md index 357c01faf9..9b4125a63c 100644 --- a/depends/README.md +++ b/depends/README.md @@ -37,7 +37,7 @@ The paths are automatically configured and no other options are needed unless ta #### For macOS cross compilation - sudo apt-get install curl librsvg2-bin libtiff-tools bsdmainutils imagemagick libcap-dev libz-dev libbz2-dev python3-setuptools libtinfo5 + sudo apt-get install curl librsvg2-bin libtiff-tools bsdmainutils cmake imagemagick libcap-dev libz-dev libbz2-dev python3-setuptools libtinfo5 Note: You must obtain the macOS SDK before proceeding with a cross-compile. Under the depends directory, create a subdirectory named `SDKs`. @@ -52,7 +52,7 @@ For more information, see [SDK Extraction](../contrib/macdeploy/README.md#sdk-ex Common linux dependencies: - sudo apt-get install make automake cmake curl g++-multilib libtool binutils-gold bsdmainutils pkg-config python3 patch bison + sudo apt-get install make automake curl g++-multilib libtool binutils-gold bsdmainutils pkg-config python3 patch bison For linux ARM cross compilation: diff --git a/depends/packages/cmake.mk b/depends/packages/cmake.mk deleted file mode 100644 index cc895de79a..0000000000 --- a/depends/packages/cmake.mk +++ /dev/null @@ -1,19 +0,0 @@ -package=cmake -$(package)_version=3.22.2 -$(package)_download_path=https://cmake.org/files/v3.22/ -$(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=3c1c478b9650b107d452c5bd545c72e2fad4e37c09b89a1984b9a2f46df6aced - -define $(package)_config_cmds - export CC="" && \ - export CXX="" && \ - ./bootstrap --prefix=$(host_prefix) -- -DCMAKE_USE_OPENSSL=OFF -endef - -define $(package)_build_cmds - $(MAKE) -endef - -define $(package)_stage_cmds - $(MAKE) DESTDIR=$($(package)_staging_dir) install -endef diff --git a/depends/packages/native_libdmg-hfsplus.mk b/depends/packages/native_libdmg-hfsplus.mk index d0c6fe113f..c0f0ce74de 100644 --- a/depends/packages/native_libdmg-hfsplus.mk +++ b/depends/packages/native_libdmg-hfsplus.mk @@ -4,7 +4,6 @@ $(package)_download_path=https://github.com/planetbeing/libdmg-hfsplus/archive $(package)_file_name=$($(package)_version).tar.gz $(package)_sha256_hash=56fbdc48ec110966342f0ecddd6f8f89202f4143ed2a3336e42bbf88f940850c $(package)_build_subdir=build -$(package)_dependencies=cmake $(package)_patches=remove-libcrypto-dependency.patch define $(package)_preprocess_cmds @@ -13,7 +12,7 @@ define $(package)_preprocess_cmds endef define $(package)_config_cmds - $(host_prefix)/bin/cmake -DCMAKE_INSTALL_PREFIX:PATH=$(build_prefix) -DCMAKE_C_FLAGS="-Wl,--build-id=none" .. + cmake -DCMAKE_INSTALL_PREFIX:PATH=$(build_prefix) -DCMAKE_C_FLAGS="-Wl,--build-id=none" .. endef define $(package)_build_cmds diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk index 543ff1dc5d..b8aa316caa 100644 --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -1,4 +1,4 @@ -packages:=boost libevent gmp backtrace cmake +packages:=boost libevent gmp backtrace qt_linux_packages:=qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libxkbcommon