Skip to content
Snippets Groups Projects
Commit eaeefc06 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Merge branch 'libevent' into 'master'

Fix libevent

See merge request !419
parents a7778ec3 f01cb0b4
No related branches found
No related tags found
1 merge request!419Fix libevent
#TODO probably wrong script, see https://github.com/libevent/libevent#cmake-unix #TODO compiles, not tested
[source] [source]
tar = "https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz" tar = "https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz"
patches = [
"redox.patch"
]
[build] [build]
template = "custom" template = "custom"
dependencies = [ dependencies = [
...@@ -11,13 +15,17 @@ COOKBOOK_CONFIGURE="cmake" ...@@ -11,13 +15,17 @@ COOKBOOK_CONFIGURE="cmake"
COOKBOOK_CONFIGURE_FLAGS=( COOKBOOK_CONFIGURE_FLAGS=(
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
-DCMAKE_CROSSCOMPILING=True -DCMAKE_CROSSCOMPILING=True
-DCMAKE_EXE_LINKER_FLAGS="-static" -DCMAKE_INSTALL_PREFIX="${COOKBOOK_STAGE}/"
-DCMAKE_INSTALL_PREFIX="/"
-DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}"
-DCMAKE_SYSTEM_NAME=Generic -DCMAKE_SYSTEM_NAME=Generic
-DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)" -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)"
-DCMAKE_VERBOSE_MAKEFILE=On -DCMAKE_VERBOSE_MAKEFILE=On
-DEVENT__LIBRARY_TYPE=STATIC
"${COOKBOOK_SOURCE}" "${COOKBOOK_SOURCE}"
) )
cookbook_configure
# Can't call `cookbook_configure` because it sets DESTDIR (which causes an error)
"${COOKBOOK_CONFIGURE}" "${COOKBOOK_CONFIGURE_FLAGS[@]}"
"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}"
"${COOKBOOK_MAKE}" install
""" """
diff -u --recursive orig/event_tagging.c modified/event_tagging.c
--- orig/event_tagging.c 2019-02-10 21:26:04.000000000 +0000
+++ modified/event_tagging.c 2024-11-17 14:14:19.474910364 +0000
@@ -54,9 +54,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#ifndef _WIN32
-#include <syslog.h>
-#endif
#ifdef EVENT__HAVE_UNISTD_H
#include <unistd.h>
#endif
diff -u --recursive orig/http.c modified/http.c
--- orig/http.c 2020-07-05 13:01:34.000000000 +0100
+++ modified/http.c 2024-11-17 14:14:10.834742812 +0000
@@ -83,9 +83,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#ifndef _WIN32
-#include <syslog.h>
-#endif /* !_WIN32 */
#include <signal.h>
#ifdef EVENT__HAVE_UNISTD_H
#include <unistd.h>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment