diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk index 67a0dd88e5def..743cc38cc7754 100644 --- a/depends/packages/zeromq.mk +++ b/depends/packages/zeromq.mk @@ -4,15 +4,13 @@ $(package)_download_path=https://github.com/zeromq/libzmq/releases/download/v$($ $(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_sha256_hash=6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43 $(package)_build_subdir=build -$(package)_patches = remove_libstd_link.patch -$(package)_patches += macos_mktemp_check.patch +$(package)_patches = macos_mktemp_check.patch $(package)_patches += builtin_sha1.patch $(package)_patches += fix_have_windows.patch $(package)_patches += openbsd_kqueue_headers.patch $(package)_patches += cmake_minimum.patch $(package)_patches += cacheline_undefined.patch $(package)_patches += no_librt.patch -$(package)_patches += fix_mingw_link.patch define $(package)_set_vars $(package)_config_opts := -DCMAKE_BUILD_TYPE=None -DWITH_DOCS=OFF -DWITH_LIBSODIUM=OFF @@ -24,15 +22,13 @@ define $(package)_set_vars endef define $(package)_preprocess_cmds - patch -p1 < $($(package)_patch_dir)/remove_libstd_link.patch && \ patch -p1 < $($(package)_patch_dir)/macos_mktemp_check.patch && \ patch -p1 < $($(package)_patch_dir)/builtin_sha1.patch && \ patch -p1 < $($(package)_patch_dir)/cacheline_undefined.patch && \ patch -p1 < $($(package)_patch_dir)/fix_have_windows.patch && \ patch -p1 < $($(package)_patch_dir)/openbsd_kqueue_headers.patch && \ patch -p1 < $($(package)_patch_dir)/cmake_minimum.patch && \ - patch -p1 < $($(package)_patch_dir)/no_librt.patch && \ - patch -p1 < $($(package)_patch_dir)/fix_mingw_link.patch + patch -p1 < $($(package)_patch_dir)/no_librt.patch endef define $(package)_config_cmds @@ -48,5 +44,6 @@ define $(package)_stage_cmds endef define $(package)_postprocess_cmds - rm -rf share + rm -rf share && \ + rm -rf lib/pkgconfig endef diff --git a/depends/patches/zeromq/fix_mingw_link.patch b/depends/patches/zeromq/fix_mingw_link.patch deleted file mode 100644 index 1434557dc72cd..0000000000000 --- a/depends/patches/zeromq/fix_mingw_link.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix CMake-generated `libzmq.pc` file - -This change mirrors the Autotools-based build system behavior for -cross-compiling for Windows with static linking. - -See https://github.com/zeromq/libzmq/pull/4706. - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 03462271..0315e606 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -546,12 +546,18 @@ if(ZMQ_HAVE_WINDOWS) - # Cannot use check_library_exists because the symbol is always declared as char(*)(void) - set(CMAKE_REQUIRED_LIBRARIES "ws2_32.lib") - check_cxx_symbol_exists(WSAStartup "winsock2.h" HAVE_WS2_32) -+ if(HAVE_WS2_32) -+ set(pkg_config_libs_private "${pkg_config_libs_private} -lws2_32") -+ endif() - - set(CMAKE_REQUIRED_LIBRARIES "rpcrt4.lib") - check_cxx_symbol_exists(UuidCreateSequential "rpc.h" HAVE_RPCRT4) - - set(CMAKE_REQUIRED_LIBRARIES "iphlpapi.lib") - check_cxx_symbol_exists(GetAdaptersAddresses "winsock2.h;iphlpapi.h" HAVE_IPHLAPI) -+ if(HAVE_IPHLAPI) -+ set(pkg_config_libs_private "${pkg_config_libs_private} -liphlpapi") -+ endif() - check_cxx_symbol_exists(if_nametoindex "iphlpapi.h" HAVE_IF_NAMETOINDEX) - - set(CMAKE_REQUIRED_LIBRARIES "") diff --git a/depends/patches/zeromq/remove_libstd_link.patch b/depends/patches/zeromq/remove_libstd_link.patch deleted file mode 100644 index ddf91e6abfaba..0000000000000 --- a/depends/patches/zeromq/remove_libstd_link.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 47d4cd12a2c051815ddda78adebdb3923b260d8a -Author: fanquake -Date: Tue Aug 18 14:45:40 2020 +0800 - - Remove needless linking against libstdc++ - - This is broken for a number of reasons, including: - - g++ understands "static-libstdc++ -lstdc++" to mean "link against - whatever libstdc++ exists, probably shared", which in itself is buggy. - - another stdlib (libc++ for example) may be in use - - See #11981. - -diff --git a/src/libzmq.pc.in b/src/libzmq.pc.in -index 233bc3a..3c2bf0d 100644 ---- a/src/libzmq.pc.in -+++ b/src/libzmq.pc.in -@@ -7,6 +7,6 @@ Name: libzmq - Description: 0MQ c++ library - Version: @VERSION@ - Libs: -L${libdir} -lzmq --Libs.private: -lstdc++ @pkg_config_libs_private@ -+Libs.private: @pkg_config_libs_private@ - Requires.private: @pkg_config_names_private@ - Cflags: -I${includedir} @pkg_config_defines@