File tree Expand file tree Collapse file tree 3 files changed +4
-52
lines changed Expand file tree Collapse file tree 3 files changed +4
-52
lines changed Original file line number Diff line number Diff line change @@ -4,7 +4,6 @@ $(package)_download_path=https://github.com/libevent/libevent/releases/download/
4
4
$(package)_file_name =$(package ) -$($(package ) _version) .tar.gz
5
5
$(package)_sha256_hash =92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb
6
6
$(package)_patches =cmake_fixups.patch
7
- $(package)_patches+ =fix_mingw_link.patch
8
7
$(package)_build_subdir =build
9
8
10
9
# When building for Windows, we set _WIN32_WINNT to target the same Windows
@@ -23,8 +22,7 @@ define $(package)_set_vars
23
22
endef
24
23
25
24
define $(package)_preprocess_cmds
26
- patch -p1 < $($(package ) _patch_dir) /cmake_fixups.patch && \
27
- patch -p1 < $($(package ) _patch_dir) /fix_mingw_link.patch
25
+ patch -p1 < $($(package ) _patch_dir) /cmake_fixups.patch
28
26
endef
29
27
30
28
define $(package)_config_cmds
@@ -40,7 +38,8 @@ define $(package)_stage_cmds
40
38
endef
41
39
42
40
define $(package)_postprocess_cmds
43
- rm -rf bin && \
41
+ rm -rf bin lib/pkgconfig && \
44
42
rm include/ev*.h && \
45
- rm include/event2/*_compat.h
43
+ rm include/event2/*_compat.h && \
44
+ rm lib/libevent.a
46
45
endef
Original file line number Diff line number Diff line change 1
1
cmake: set minimum version to 3.5
2
2
3
- Fix generated pkg-config files, see
4
- https://github.com/libevent/libevent/pull/1165.
5
-
6
3
--- a/CMakeLists.txt
7
4
+++ b/CMakeLists.txt
8
5
@@ -19,7 +19,7 @@
@@ -14,22 +11,3 @@ https://github.com/libevent/libevent/pull/1165.
14
11
15
12
if (POLICY CMP0054)
16
13
cmake_policy(SET CMP0054 NEW)
17
- diff --git a/cmake/AddEventLibrary.cmake b/cmake/AddEventLibrary.cmake
18
- index 04f5837e..d8ea42c4 100644
19
- --- a/cmake/AddEventLibrary.cmake
20
- +++ b/cmake/AddEventLibrary.cmake
21
- @@ -20,12 +20,12 @@ macro(generate_pkgconfig LIB_NAME)
22
-
23
- set(LIBS "")
24
- foreach (LIB ${LIB_PLATFORM})
25
- - set(LIBS "${LIBS} -L${LIB}")
26
- + set(LIBS "${LIBS} -l${LIB}")
27
- endforeach()
28
-
29
- set(OPENSSL_LIBS "")
30
- foreach(LIB ${OPENSSL_LIBRARIES})
31
- - set(OPENSSL_LIBS "${OPENSSL_LIBS} -L${LIB}")
32
- + set(OPENSSL_LIBS "${OPENSSL_LIBS} -l${LIB}")
33
- endforeach()
34
-
35
- configure_file("lib${LIB_NAME}.pc.in" "lib${LIB_NAME}.pc" @ONLY)
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments