mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-23 12:33:26 -05:00
713bf66b1f
f89f16846edepends: Fix compiling `libevent` package on NetBSD (Hennadii Stepanov) Pull request description: Libevent [introduced](https://github.com/libevent/libevent/pull/909) the [`typeof`](https://gcc.gnu.org/onlinedocs/gcc/Typeof.html) C language extension in the NetBSD-specific code, which was pulled into our depends in https://github.com/bitcoin/bitcoin/pull/21991. However, GCC [states](https://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html): > the various `-std` options disable certain keywords. Due to our use ofb042c4f053/depends/hosts/netbsd.mk (L1)the `typeof` keyword is disabled, resulting in a compilation error: ``` $ gmake -C depends libevent CC=/usr/pkg/gcc14/bin/gcc CXX=/usr/pkg/gcc14/bin/g++ <snip> [ 37%] Building C object CMakeFiles/event_core_static.dir/kqueue.c.o /home/hebasto/dev/bitcoin/depends/work/build/x86_64-unknown-netbsd10.0/libevent/2.1.12-stable-ca6b96ec97c/kqueue.c: In function 'kq_setup_kevent': /home/hebasto/dev/bitcoin/depends/work/build/x86_64-unknown-netbsd10.0/libevent/2.1.12-stable-ca6b96ec97c/kqueue.c:56:27: error: implicit declaration of function 'typeof' [-Wimplicit-function-declaration] 56 | #define INT_TO_UDATA(x) ((typeof(((struct kevent *)0)->udata))(intptr_t)(x)) | ^~~~~~ /home/hebasto/dev/bitcoin/depends/work/build/x86_64-unknown-netbsd10.0/libevent/2.1.12-stable-ca6b96ec97c/kqueue.c:190:30: note: in expansion of macro 'INT_TO_UDATA' 190 | out->udata = INT_TO_UDATA(ADD_UDATA); | ^~~~~~~~~~~~ /home/hebasto/dev/bitcoin/depends/work/build/x86_64-unknown-netbsd10.0/libevent/2.1.12-stable-ca6b96ec97c/kqueue.c:56:64: error: expected expression before 'intptr_t' 56 | #define INT_TO_UDATA(x) ((typeof(((struct kevent *)0)->udata))(intptr_t)(x)) | ^~~~~~~~ /home/hebasto/dev/bitcoin/depends/work/build/x86_64-unknown-netbsd10.0/libevent/2.1.12-stable-ca6b96ec97c/kqueue.c:190:30: note: in expansion of macro 'INT_TO_UDATA' 190 | out->udata = INT_TO_UDATA(ADD_UDATA); | ^~~~~~~~~~~~ /home/hebasto/dev/bitcoin/depends/work/build/x86_64-unknown-netbsd10.0/libevent/2.1.12-stable-ca6b96ec97c/kqueue.c:56:27: error: called object is not a function or function pointer 56 | #define INT_TO_UDATA(x) ((typeof(((struct kevent *)0)->udata))(intptr_t)(x)) | ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /home/hebasto/dev/bitcoin/depends/work/build/x86_64-unknown-netbsd10.0/libevent/2.1.12-stable-ca6b96ec97c/kqueue.c:190:30: note: in expansion of macro 'INT_TO_UDATA' 190 | out->udata = INT_TO_UDATA(ADD_UDATA); | ^~~~~~~~~~~~ gmake[3]: *** [CMakeFiles/event_core_static.dir/build.make:328: CMakeFiles/event_core_static.dir/kqueue.c.o] Error 1 <snip> ``` This PR resolves this issue by following GCC's [recommendation](https://gcc.gnu.org/onlinedocs/gcc/Typeof.html): > write `__typeof__` instead of `typeof`. ACKs for top commit: fanquake: ACKf89f16846eTree-SHA512: c0d2e535408db120535781f8518c616b0f5a39b1c6babb2a74e8e0565348aaf00b0f5a93cac0af7cf6d6bf028d5d58763fe71b3969ed9c7059fa7c3dca9d084c
48 lines
1.7 KiB
Makefile
48 lines
1.7 KiB
Makefile
package=libevent
|
|
$(package)_version=2.1.12-stable
|
|
$(package)_download_path=https://github.com/libevent/libevent/releases/download/release-$($(package)_version)/
|
|
$(package)_file_name=$(package)-$($(package)_version).tar.gz
|
|
$(package)_sha256_hash=92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb
|
|
$(package)_patches=cmake_fixups.patch
|
|
$(package)_patches += netbsd_fixup.patch
|
|
$(package)_build_subdir=build
|
|
|
|
# When building for Windows, we set _WIN32_WINNT to target the same Windows
|
|
# version as we do in releases. Due to quirks in libevents build system, this
|
|
# is also required to enable support for ipv6. See #19375.
|
|
define $(package)_set_vars
|
|
$(package)_config_opts=-DCMAKE_BUILD_TYPE=None -DEVENT__DISABLE_BENCHMARK=ON -DEVENT__DISABLE_OPENSSL=ON
|
|
$(package)_config_opts+=-DEVENT__DISABLE_SAMPLES=ON -DEVENT__DISABLE_REGRESS=ON
|
|
$(package)_config_opts+=-DEVENT__DISABLE_TESTS=ON -DEVENT__LIBRARY_TYPE=STATIC
|
|
$(package)_cflags += -fdebug-prefix-map=$($(package)_extract_dir)=/usr -fmacro-prefix-map=$($(package)_extract_dir)=/usr
|
|
$(package)_cppflags += -D_GNU_SOURCE
|
|
$(package)_cppflags_mingw32=-D_WIN32_WINNT=0x0A00
|
|
|
|
ifeq ($(NO_HARDEN),)
|
|
$(package)_cppflags+=-D_FORTIFY_SOURCE=3
|
|
endif
|
|
endef
|
|
|
|
define $(package)_preprocess_cmds
|
|
patch -p1 < $($(package)_patch_dir)/cmake_fixups.patch && \
|
|
patch -p1 < $($(package)_patch_dir)/netbsd_fixup.patch
|
|
endef
|
|
|
|
define $(package)_config_cmds
|
|
$($(package)_cmake) -S .. -B .
|
|
endef
|
|
|
|
define $(package)_build_cmds
|
|
$(MAKE)
|
|
endef
|
|
|
|
define $(package)_stage_cmds
|
|
$(MAKE) DESTDIR=$($(package)_staging_dir) install
|
|
endef
|
|
|
|
define $(package)_postprocess_cmds
|
|
rm -rf bin lib/pkgconfig && \
|
|
rm include/ev*.h && \
|
|
rm include/event2/*_compat.h && \
|
|
rm lib/libevent.a
|
|
endef
|