OpenIPC
/
firmware
mirror of https://github.com/OpenIPC/firmware.git
1
0
Fork 0
Code Activity

Migrate Libevent build from automake to CMake (#320)

pull/322/head
Dmitry Ilyin 2022-08-08 14:46:45 +03:00 committed by GitHub
parent 1578aed840
commit 5e9f043753
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
general/package/libevent-openipc/crutch/0001-libevent-mbedtls.patch
View File

@ -1,13 +0,0 @@
diff --git a/buffer.c b/buffer.c
index 822d97a5..646763b4 100644
--- a/buffer.c
+++ b/buffer.c
@@ -3070,7 +3070,7 @@ evbuffer_file_segment_materialize(struct evbuffer_file_segment *seg)
offset_leftover = offset % page_size;
offset_rounded = offset - offset_leftover;
}
- mapped = mmap(NULL, length + offset_leftover,
+ mapped = mmap64(NULL, length + offset_leftover,
PROT_READ,
#ifdef MAP_NOCACHE
MAP_NOCACHE | /* ??? */

49
general/package/libevent-openipc/libevent-openipc.mk
View File

@ -4,46 +4,24 @@
#
################################################################################
LIBEVENT_OPENIPC_VERSION = bf3ce77f6cf113839defa70b30e183d471a0dab5
LIBEVENT_OPENIPC_SITE = $(call github,libevent,libevent,$(LIBEVENT_OPENIPC_VERSION))
LIBEVENT_OPENIPC_VERSION = mmap64
LIBEVENT_OPENIPC_SITE = $(call github,widgetii,libevent,$(LIBEVENT_OPENIPC_VERSION))
LIBEVENT_OPENIPC_INSTALL_STAGING = YES
LIBEVENT_OPENIPC_LICENSE = BSD-3-Clause, OpenBSD
LIBEVENT_OPENIPC_LICENSE_FILES = LICENSE
# This package uses autoconf, but not automake, so we need to call
# their special autogen.sh script, and have custom target and staging
# installation commands.
define LIBEVENT_OPENIPC_RUN_CRUTCH
cd $(@D) && patch -i $(TOPDIR)/../general/package/libevent-openipc/crutch/0001-libevent-mbedtls.patch
endef
define LIBEVENT_OPENIPC_RUN_AUTOGEN
cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
endef
ifeq ($(BR2_TOOLCHAIN_BUILDROOT_MUSL),y)
LIBEVENT_OPENIPC_PRE_CONFIGURE_HOOKS += LIBEVENT_OPENIPC_RUN_CRUTCH LIBEVENT_OPENIPC_RUN_AUTOGEN
else
LIBEVENT_OPENIPC_PRE_CONFIGURE_HOOKS += LIBEVENT_OPENIPC_RUN_AUTOGEN
endif
LIBEVENT_OPENIPC_CONF_OPTS = \
--disable-libevent-regress \
--disable-samples \
--disable-debug-mode \
--disable-largefile
HOST_LIBEVENT_OPENIPC_CONF_OPTS = \
--disable-libevent-regress \
--disable-samples \
--disable-openssl
-DEVENT__DISABLE_BENCHMARK=ON \
-DEVENT__DISABLE_SAMPLES=ON \
-DEVENT__DISABLE_TESTS=ON \
-DCMAKE_BUILD_TYPE=Release
define LIBEVENT_OPENIPC_REMOVE_PYSCRIPT
rm $(TARGET_DIR)/usr/bin/event_rpcgen.py
endef
define LIBEVENT_OPENIPC_DELETE_UNUSED
rm -r $(TARGET_DIR)/usr/lib/libevent-2.2.so
rm -f $(TARGET_DIR)/usr/lib/libevent-2.2.so.1.0.0
rm -f $(TARGET_DIR)/usr/lib/libevent-2.2.so.1
rm -f $(TARGET_DIR)/usr/lib/libevent.so
@ -57,19 +35,18 @@ endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
LIBEVENT_OPENIPC_DEPENDENCIES += host-pkgconf openssl
LIBEVENT_OPENIPC_CONF_OPTS += --enable-openssl
LIBEVENT_OPENIPC_CONF_OPTS += -DEVENT__DISABLE_OPENSSL=OFF
else
LIBEVENT_OPENIPC_CONF_OPTS += --disable-openssl
LIBEVENT_OPENIPC_CONF_OPTS += -DEVENT__DISABLE_OPENSSL=ON
endif
ifeq ($(BR2_PACKAGE_MBEDTLS_OPENIPC),y)
LIBEVENT_OPENIPC_DEPENDENCIES += host-pkgconf mbedtls-openipc
LIBEVENT_OPENIPC_CONF_OPTS += --enable-mbedtls
LIBEVENT_OPENIPC_CONF_OPTS += -DEVENT__DISABLE_MBEDTLS=OFF
else
LIBEVENT_OPENIPC_CONF_OPTS += --disable-mbedtls
LIBEVENT_OPENIPC_CONF_OPTS += -DEVENT__DISABLE_MBEDTLS=ON
endif
LIBEVENT_OPENIPC_POST_INSTALL_TARGET_HOOKS += LIBEVENT_OPENIPC_DELETE_UNUSED
$(eval $(autotools-package))
$(eval $(host-autotools-package))
$(eval $(cmake-package))