aboutsummaryrefslogtreecommitdiff
path: root/depends/patches/zeromq
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2020-08-18 14:50:14 +0800
committerfanquake <fanquake@gmail.com>2020-08-25 14:37:44 +0800
commit4af59a407a207e7de327c1bb145d68ebc8ddedd8 (patch)
tree91a4f5e913a21cb7ebd9f5888d8182aa18a6f3c3 /depends/patches/zeromq
parentcc107a3af17d821f66de9357efe73214a628803b (diff)
build: use patch rather than sed in zeromq package
Diffstat (limited to 'depends/patches/zeromq')
-rw-r--r--depends/patches/zeromq/remove_libstd_link.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/depends/patches/zeromq/remove_libstd_link.patch b/depends/patches/zeromq/remove_libstd_link.patch
new file mode 100644
index 0000000000..ddf91e6abf
--- /dev/null
+++ b/depends/patches/zeromq/remove_libstd_link.patch
@@ -0,0 +1,25 @@
+commit 47d4cd12a2c051815ddda78adebdb3923b260d8a
+Author: fanquake <fanquake@gmail.com>
+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@