Skip to content

Commit 5a96767

Browse files
committed
depends, libevent: Do not install *.pc files and remove patches for them
1 parent ffda355 commit 5a96767

File tree

3 files changed

+4
-52
lines changed

3 files changed

+4
-52
lines changed

depends/packages/libevent.mk

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ $(package)_download_path=https://github.com/libevent/libevent/releases/download/
44
$(package)_file_name=$(package)-$($(package)_version).tar.gz
55
$(package)_sha256_hash=92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb
66
$(package)_patches=cmake_fixups.patch
7-
$(package)_patches+=fix_mingw_link.patch
87
$(package)_build_subdir=build
98

109
# When building for Windows, we set _WIN32_WINNT to target the same Windows
@@ -23,8 +22,7 @@ define $(package)_set_vars
2322
endef
2423

2524
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
2826
endef
2927

3028
define $(package)_config_cmds
@@ -40,7 +38,8 @@ define $(package)_stage_cmds
4038
endef
4139

4240
define $(package)_postprocess_cmds
43-
rm -rf bin && \
41+
rm -rf bin lib/pkgconfig && \
4442
rm include/ev*.h && \
45-
rm include/event2/*_compat.h
43+
rm include/event2/*_compat.h && \
44+
rm lib/libevent.a
4645
endef
Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
cmake: set minimum version to 3.5
22

3-
Fix generated pkg-config files, see
4-
https://github.com/libevent/libevent/pull/1165.
5-
63
--- a/CMakeLists.txt
74
+++ b/CMakeLists.txt
85
@@ -19,7 +19,7 @@
@@ -14,22 +11,3 @@ https://github.com/libevent/libevent/pull/1165.
1411

1512
if (POLICY CMP0054)
1613
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)

depends/patches/libevent/fix_mingw_link.patch

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)