pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

galera: fix build on NetBSD>=10



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Wed Jan 11 21:26:32 2023 +0100
Changeset:	431695c570ee0213a2f59b1159edcd6e63e00358

Modified Files:
	galera/PLIST
	galera/distinfo
Added Files:
	galera/patches/patch-asio_asio_detail_impl_kqueue__reactor.ipp
Removed Files:
	galera/TODO

Log Message:
galera: fix build on NetBSD>=10

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=431695c570ee0213a2f59b1159edcd6e63e00358

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 galera/PLIST                                       |  5 ++-
 galera/TODO                                        | 41 ----------------------
 galera/distinfo                                    |  1 +
 ...patch-asio_asio_detail_impl_kqueue__reactor.ipp | 17 +++++++++
 4 files changed, 20 insertions(+), 44 deletions(-)

diffs:
diff --git a/galera/PLIST b/galera/PLIST
index 92ba51a2d7..b65af6a340 100644
--- a/galera/PLIST
+++ b/galera/PLIST
@@ -1,4 +1,3 @@
 @comment $NetBSD$
-@comment TODO: to fill this file with the file listing:
-@comment TODO: 1. run "/usr/bin/make package"
-@comment TODO: 2. run "/usr/bin/make print-PLIST"
+bin/garbd
+lib/libgalera_smm.so
diff --git a/galera/TODO b/galera/TODO
deleted file mode 100644
index 77193ca63d..0000000000
--- a/galera/TODO
+++ /dev/null
@@ -1,41 +0,0 @@
-In file included from /usr/include/wchar.h:61,
-                 from /usr/include/g++/cwchar:44,
-                 from /usr/include/g++/bits/postypes.h:40,
-                 from /usr/include/g++/bits/char_traits.h:40,
-                 from /usr/include/g++/string:40,
-                 from /scratch/wip/galera/work/galera-release_26.4.13/galerautils/src/gu_string_utils.hpp:6,
-                 from /scratch/wip/galera/work/galera-release_26.4.13/galerautils/src/gu_config.hpp:13,
-                 from /scratch/wip/galera/work/galera-release_26.4.13/galerautils/src/gu_asio.hpp:13,
-                 from /scratch/wip/galera/work/galera-release_26.4.13/galerautils/src/gu_asio_stream_engine.hpp:17,
-                 from /scratch/wip/galera/work/galera-release_26.4.13/galerautils/src/gu_asio_stream_engine.cpp:7:
-/scratch/wip/galera/work/galera-release_26.4.13/asio/asio/detail/impl/kqueue_reactor.ipp: In constructor 'asio::detail::kqueue_reactor::kqueue_reactor(asio::execution_context&)':
-/scratch/wip/galera/work/galera-release_26.4.13/asio/asio/detail/impl/kqueue_reactor.ipp:53:3: error: invalid 'static_cast' from type 'intptr_t' {aka 'long int'} to type 'void*'
-   53 |   ASIO_KQUEUE_EV_SET(&events[0], interrupter_.read_descriptor(),
-      |   ^~~~~~~~~~~~~~~~~~
-/scratch/wip/galera/work/galera-release_26.4.13/asio/asio/detail/impl/kqueue_reactor.ipp: In member function 'virtual void asio::detail::kqueue_reactor::notify_fork(asio::execution_context::fork_event)':
-/scratch/wip/galera/work/galera-release_26.4.13/asio/asio/detail/impl/kqueue_reactor.ipp:101:5: error: invalid 'static_cast' from type 'intptr_t' {aka 'long int'} to type 'void*'
-  101 |     ASIO_KQUEUE_EV_SET(&events[0], interrupter_.read_descriptor(),
-      |     ^~~~~~~~~~~~~~~~~~
-/scratch/wip/galera/work/galera-release_26.4.13/asio/asio/detail/impl/kqueue_reactor.ipp:117:9: error: invalid 'static_cast' from type 'intptr_t' {aka 'long int'} to type 'void*'
-  117 |         ASIO_KQUEUE_EV_SET(&events[0], state->descriptor_,
-      |         ^~~~~~~~~~~~~~~~~~
-/scratch/wip/galera/work/galera-release_26.4.13/asio/asio/detail/impl/kqueue_reactor.ipp:119:9: error: invalid 'static_cast' from type 'intptr_t' {aka 'long int'} to type 'void*'
-  119 |         ASIO_KQUEUE_EV_SET(&events[1], state->descriptor_,
-      |         ^~~~~~~~~~~~~~~~~~
-/scratch/wip/galera/work/galera-release_26.4.13/asio/asio/detail/impl/kqueue_reactor.ipp: In member function 'int asio::detail::kqueue_reactor::register_internal_descriptor(int, asio::detail::socket_type, asio::detail::kqueue_reactor::descriptor_state*&, asio::detail::reactor_op*)':
-/scratch/wip/galera/work/galera-release_26.4.13/asio/asio/detail/impl/kqueue_reactor.ipp:173:3: error: invalid 'static_cast' from type 'intptr_t' {aka 'long int'} to type 'void*'
-  173 |   ASIO_KQUEUE_EV_SET(&events[0], descriptor, EVFILT_READ,
-      |   ^~~~~~~~~~~~~~~~~~
-/scratch/wip/galera/work/galera-release_26.4.13/asio/asio/detail/impl/kqueue_reactor.ipp: In member function 'void asio::detail::kqueue_reactor::start_op(int, asio::detail::socket_type, asio::detail::kqueue_reactor::descriptor_state*&, asio::detail::reactor_op*, bool, bool)':
-/scratch/wip/galera/work/galera-release_26.4.13/asio/asio/detail/impl/kqueue_reactor.ipp:226:9: error: invalid 'static_cast' from type 'intptr_t' {aka 'long int'} to type 'void*'
-  226 |         ASIO_KQUEUE_EV_SET(&events[0], descriptor, EVFILT_READ,
-      |         ^~~~~~~~~~~~~~~~~~
-/scratch/wip/galera/work/galera-release_26.4.13/asio/asio/detail/impl/kqueue_reactor.ipp:228:9: error: invalid 'static_cast' from type 'intptr_t' {aka 'long int'} to type 'void*'
-  228 |         ASIO_KQUEUE_EV_SET(&events[1], descriptor, EVFILT_WRITE,
-      |         ^~~~~~~~~~~~~~~~~~
-/scratch/wip/galera/work/galera-release_26.4.13/asio/asio/detail/impl/kqueue_reactor.ipp:249:7: error: invalid 'static_cast' from type 'intptr_t' {aka 'long int'} to type 'void*'
-  249 |       ASIO_KQUEUE_EV_SET(&events[0], descriptor, EVFILT_READ,
-      |       ^~~~~~~~~~~~~~~~~~
-/scratch/wip/galera/work/galera-release_26.4.13/asio/asio/detail/impl/kqueue_reactor.ipp:251:7: error: invalid 'static_cast' from type 'intptr_t' {aka 'long int'} to type 'void*'
-  251 |       ASIO_KQUEUE_EV_SET(&events[1], descriptor, EVFILT_WRITE,
-      |       ^~~~~~~~~~~~~~~~~~
diff --git a/galera/distinfo b/galera/distinfo
index 7bcf3adb38..90dd292c60 100644
--- a/galera/distinfo
+++ b/galera/distinfo
@@ -6,6 +6,7 @@ Size (694d6ca47f5eec7873be99b7d6babccf633d1231.tar.gz) = 91929 bytes
 BLAKE2s (galera-26.4.13.tar.gz) = 54717494b2abda58deffeb91a73aff1948ec5d9a155438208c6d58cdcf61446c
 SHA512 (galera-26.4.13.tar.gz) = 34bd8eecf45efe8237256672eb164060ef4f8b9548b0da4392d6c45507f215d85272bf9fe883ec365ae8541051edc4c1a8b9f2d4bd9158100264bd824cc6cc61
 Size (galera-26.4.13.tar.gz) = 3587759 bytes
+SHA1 (patch-asio_asio_detail_impl_kqueue__reactor.ipp) = edbfcf032d102337362b248b306aad2da6cac609
 SHA1 (patch-cmake_crc32c.cmake) = f81ca80457b529cd72999c25c21cfa54def28a84
 SHA1 (patch-galerautils_SConscript) = 8c53d2d110bba19dda5c1dbda872492aa5010701
 SHA1 (patch-galerautils_src_gu__arch.h) = 317bac921afb5cf8134e2a93dbd6984d4018e750
diff --git a/galera/patches/patch-asio_asio_detail_impl_kqueue__reactor.ipp b/galera/patches/patch-asio_asio_detail_impl_kqueue__reactor.ipp
new file mode 100644
index 0000000000..34716fd7f9
--- /dev/null
+++ b/galera/patches/patch-asio_asio_detail_impl_kqueue__reactor.ipp
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Fix build on NetBSD>=10.
+
+--- asio/asio/detail/impl/kqueue_reactor.ipp.orig	2022-11-02 06:09:14.000000000 +0000
++++ asio/asio/detail/impl/kqueue_reactor.ipp
+@@ -28,6 +28,10 @@
+ #include "asio/detail/push_options.hpp"
+ 
+ #if defined(__NetBSD__)
++#include <sys/param.h>
++#endif
++
++#if defined(__NetBSD__) && __NetBSD_Version__ < 1000000000
+ # define ASIO_KQUEUE_EV_SET(ev, ident, filt, flags, fflags, data, udata) \
+     EV_SET(ev, ident, filt, flags, fflags, data, \
+       reinterpret_cast<intptr_t>(static_cast<void*>(udata)))


Home | Main Index | Thread Index | Old Index