File tree Expand file tree Collapse file tree 2 files changed +28
-2
lines changed Expand file tree Collapse file tree 2 files changed +28
-2
lines changed Original file line number Diff line number Diff line change @@ -3,6 +3,7 @@ $(package)_version=4.3.1
3
3
$(package)_download_path =https://github.com/zeromq/libzmq/releases/download/v$($(package ) _version) /
4
4
$(package)_file_name =$(package ) -$($(package ) _version) .tar.gz
5
5
$(package)_sha256_hash =bcbabe1e2c7d0eec4ed612e10b94b112dd5f06fcefa994a0c79a45d835cd21eb
6
+ $(package)_patches =remove_libstd_link.patch
6
7
7
8
define $(package)_set_vars
8
9
$(package ) _config_opts=--without-docs --disable-shared --disable-curve --disable-curve-keygen --disable-perf
@@ -18,7 +19,8 @@ define $(package)_set_vars
18
19
endef
19
20
20
21
define $(package)_preprocess_cmds
21
- cp -f $(BASEDIR ) /config.guess $(BASEDIR ) /config.sub config
22
+ patch -p1 < $($(package ) _patch_dir) /remove_libstd_link.patch && \
23
+ cp -f $(BASEDIR ) /config.guess $(BASEDIR ) /config.sub config
22
24
endef
23
25
24
26
define $(package)_config_cmds
@@ -34,6 +36,5 @@ define $(package)_stage_cmds
34
36
endef
35
37
36
38
define $(package)_postprocess_cmds
37
- sed -i.old "s/ -lstdc++//" lib/pkgconfig/libzmq.pc && \
38
39
rm -rf bin share lib/*.la
39
40
endef
Original file line number Diff line number Diff line change
1
+ commit 47d4cd12a2c051815ddda78adebdb3923b260d8a
2
+ Author: fanquake <
[email protected] >
3
+ Date: Tue Aug 18 14:45:40 2020 +0800
4
+
5
+ Remove needless linking against libstdc++
6
+
7
+ This is broken for a number of reasons, including:
8
+ - g++ understands "static-libstdc++ -lstdc++" to mean "link against
9
+ whatever libstdc++ exists, probably shared", which in itself is buggy.
10
+ - another stdlib (libc++ for example) may be in use
11
+
12
+ See #11981.
13
+
14
+ diff --git a/src/libzmq.pc.in b/src/libzmq.pc.in
15
+ index 233bc3a..3c2bf0d 100644
16
+ --- a/src/libzmq.pc.in
17
+ +++ b/src/libzmq.pc.in
18
+ @@ -7,6 +7,6 @@ Name: libzmq
19
+ Description: 0MQ c++ library
20
+ Version: @VERSION@
21
+ Libs: -L${libdir} -lzmq
22
+ - Libs.private: -lstdc++ @pkg_config_libs_private@
23
+ + Libs.private: @pkg_config_libs_private@
24
+ Requires.private: @pkg_config_names_private@
25
+ Cflags: -I${includedir} @pkg_config_defines@
You can’t perform that action at this time.
0 commit comments