-
-
Notifications
You must be signed in to change notification settings - Fork 10.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update libevent to 2.1.11 Use CMake instead GNU Autotools Backport following commits: libevent/libevent@f05ba67 ..and partially libevent/libevent@7201062 to fix compilation Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
- Loading branch information
Showing
5 changed files
with
94 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
package/libs/libevent2/patches/0001-Add-missing-file-Uninstall.cmake.in.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| From 9c2d9d2c8f65d7c6bb268c0e9795bac296661ca8 Mon Sep 17 00:00:00 2001 | ||
| From: Daniel Engberg <daniel.engberg.lists@pyret.net> | ||
| Date: Wed, 7 Aug 2019 00:56:39 +0200 | ||
| Subject: [PATCH] Add missing file Uninstall.cmake.in | ||
|
|
||
| Needed to fix compilation | ||
|
|
||
| Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net> | ||
| --- | ||
| cmake/Uninstall.cmake.in | 23 +++++++++++++++++++++++ | ||
| 1 file changed, 23 insertions(+) | ||
| create mode 100644 cmake/Uninstall.cmake.in | ||
|
|
||
| diff --git a/cmake/Uninstall.cmake.in b/cmake/Uninstall.cmake.in | ||
| new file mode 100644 | ||
| index 0000000..c6dc09e | ||
| --- /dev/null | ||
| +++ b/cmake/Uninstall.cmake.in | ||
| @@ -0,0 +1,23 @@ | ||
| +# https://gitlab.kitware.com/cmake/community/wikis/FAQ#can-i-do-make-uninstall-with-cmake | ||
| + | ||
| +if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt") | ||
| + message(FATAL_ERROR "Cannot find install manifest: @CMAKE_BINARY_DIR@/install_manifest.txt") | ||
| +endif(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt") | ||
| + | ||
| +file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files) | ||
| +string(REGEX REPLACE "\n" ";" files "${files}") | ||
| +foreach(file ${files}) | ||
| + message(STATUS "Uninstalling $ENV{DESTDIR}${file}") | ||
| + if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") | ||
| + exec_program( | ||
| + "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" | ||
| + OUTPUT_VARIABLE rm_out | ||
| + RETURN_VALUE rm_retval | ||
| + ) | ||
| + if(NOT "${rm_retval}" STREQUAL 0) | ||
| + message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}") | ||
| + endif(NOT "${rm_retval}" STREQUAL 0) | ||
| + else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") | ||
| + message(STATUS "File $ENV{DESTDIR}${file} does not exist.") | ||
| + endif(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") | ||
| +endforeach(file) | ||
| -- | ||
| 2.22.0 | ||
|
|
49 changes: 0 additions & 49 deletions
49
...ge/libs/libevent2/patches/0001-Do-not-check-for-ERR_remove_thread_state-do-not-link.patch
This file was deleted.
Oops, something went wrong.
25 changes: 25 additions & 0 deletions
25
package/libs/libevent2/patches/0002-Add-Uninstall.cmake.in-into-dist-archive.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| From f05ba671931e2b4e38459899f6f63f79f99869fe Mon Sep 17 00:00:00 2001 | ||
| From: Azat Khuzhin <a3at.mail@gmail.com> | ||
| Date: Sat, 3 Aug 2019 14:32:21 +0300 | ||
| Subject: [PATCH] Add Uninstall.cmake.in into dist archive | ||
|
|
||
| Fixes: #863 | ||
| --- | ||
| Makefile.am | 1 + | ||
| 1 file changed, 1 insertion(+) | ||
|
|
||
| diff --git a/Makefile.am b/Makefile.am | ||
| index af75a963..92f9433c 100644 | ||
| --- a/Makefile.am | ||
| +++ b/Makefile.am | ||
| @@ -127,6 +127,7 @@ CMAKE_FILES = \ | ||
| cmake/LibeventConfig.cmake.in \ | ||
| cmake/LibeventConfigVersion.cmake.in \ | ||
| cmake/VersionViaGit.cmake \ | ||
| + cmake/Uninstall.cmake.in \ | ||
| event-config.h.cmake \ | ||
| evconfig-private.h.cmake \ | ||
| CMakeLists.txt | ||
| -- | ||
| 2.22.0 | ||
|
|
13 changes: 0 additions & 13 deletions
13
package/libs/libevent2/patches/0002-Makefile.am-omit-building-sample-and-test.patch
This file was deleted.
Oops, something went wrong.