[tarantool-patches] [PATCH v2] Fix FreeBSD build

[tarantool-patches] [PATCH v2] Fix FreeBSD build

[Alexander V. Tikhonov]

Fixed swim headers in addition to commit:
88892f13a3934c72721e6240bfa5fe174d62d99b ('swim: fix build on FreeBSD')

Included unistd.h header to fix the following errors:

In file included from src/lib/swim/swim_transport_udp.c:31:
src/lib/swim/swim_transport.h:61:1:
    error: unknown type name 'ssize_t'; did you mean 'size_t'?
ssize_t
^~~~~~~
size_t
/usr/include/netinet6/in6.h:698:18: note: 'size_t' declared here
typedef __size_t        size_t;
                        ^
In file included from src/lib/swim/swim_transport_udp.c:31:
src/lib/swim/swim_transport.h:66:1:
    error: unknown type name 'ssize_t'; did you mean 'size_t'?
ssize_t
^~~~~~~
size_t
/usr/include/netinet6/in6.h:698:18: note: 'size_t' declared here
typedef __size_t        size_t;

Closes #4050
---

Github: https://github.com/tarantool/tarantool/tree/avtikhon/freebsd-fix-build 
Issue: https://github.com/tarantool/tarantool/issues/4050

 src/lib/swim/swim_transport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/swim/swim_transport.h b/src/lib/swim/swim_transport.h
index c4e48cdeb..31fd9af59 100644
--- a/src/lib/swim/swim_transport.h
+++ b/src/lib/swim/swim_transport.h
@@ -32,6 +32,7 @@
  */
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <unistd.h>
 
 struct ifaddrs;
 
-- 
2.17.1

[tarantool-patches] Re: [PATCH v2] Fix FreeBSD build

[Alexander Turenko]

Looks ok.

CCed Vlad just in case.

Verified on FreeBSD-12.0-RELEASE. It builds, but there are failed tests:

* wal_off/snapshot_stress.test.lua
* app-tap/minimal.test.lua
* app-tap/pwd.test.lua

Maybe others, I don't know: box/net_msg_max.test.lua and
app-tap/tarantoolctl.test.lua hung, so the testing stucks. See also
https://github.com/tarantool/tarantool/issues/4271

Kirill, can you proceed with the patch? AFAIU it is needed in master and
2.1.

branch: avtikhon/freebsd-fix-build

WBR, Alexander Turenko.

On Wed, Jun 05, 2019 at 03:10:18PM +0300, Alexander V. Tikhonov wrote:
> Fixed swim headers in addition to commit:
> 88892f13a3934c72721e6240bfa5fe174d62d99b ('swim: fix build on FreeBSD')
> 
> Included unistd.h header to fix the following errors:
> 
> In file included from src/lib/swim/swim_transport_udp.c:31:
> src/lib/swim/swim_transport.h:61:1:
>     error: unknown type name 'ssize_t'; did you mean 'size_t'?
> ssize_t
> ^~~~~~~
> size_t
> /usr/include/netinet6/in6.h:698:18: note: 'size_t' declared here
> typedef __size_t        size_t;
>                         ^
> In file included from src/lib/swim/swim_transport_udp.c:31:
> src/lib/swim/swim_transport.h:66:1:
>     error: unknown type name 'ssize_t'; did you mean 'size_t'?
> ssize_t
> ^~~~~~~
> size_t
> /usr/include/netinet6/in6.h:698:18: note: 'size_t' declared here
> typedef __size_t        size_t;
> 
> Closes #4050
> ---
> 
> Github: https://github.com/tarantool/tarantool/tree/avtikhon/freebsd-fix-build 
> Issue: https://github.com/tarantool/tarantool/issues/4050
> 
>  src/lib/swim/swim_transport.h | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/src/lib/swim/swim_transport.h b/src/lib/swim/swim_transport.h
> index c4e48cdeb..31fd9af59 100644
> --- a/src/lib/swim/swim_transport.h
> +++ b/src/lib/swim/swim_transport.h
> @@ -32,6 +32,7 @@
>   */
>  #include <netinet/in.h>
>  #include <arpa/inet.h>
> +#include <unistd.h>
>  
>  struct ifaddrs;
>  
> -- 
> 2.17.1
> 

[tarantool-patches] Re: [PATCH v2] Fix FreeBSD build

[Kirill Yukhin]

Hello,

On 05 Jun 15:10, Alexander V. Tikhonov wrote:
> Fixed swim headers in addition to commit:
> 88892f13a3934c72721e6240bfa5fe174d62d99b ('swim: fix build on FreeBSD')
> 
> Included unistd.h header to fix the following errors:
> 
> In file included from src/lib/swim/swim_transport_udp.c:31:
> src/lib/swim/swim_transport.h:61:1:
>     error: unknown type name 'ssize_t'; did you mean 'size_t'?
> ssize_t
> ^~~~~~~
> size_t
> /usr/include/netinet6/in6.h:698:18: note: 'size_t' declared here
> typedef __size_t        size_t;
>                         ^
> In file included from src/lib/swim/swim_transport_udp.c:31:
> src/lib/swim/swim_transport.h:66:1:
>     error: unknown type name 'ssize_t'; did you mean 'size_t'?
> ssize_t
> ^~~~~~~
> size_t
> /usr/include/netinet6/in6.h:698:18: note: 'size_t' declared here
> typedef __size_t        size_t;
> 
> Closes #4050
> ---
> 
> Github: https://github.com/tarantool/tarantool/tree/avtikhon/freebsd-fix-build 
> Issue: https://github.com/tarantool/tarantool/issues/4050

I've checked your patch into master and 2.1 branch.

--
Regards, Kirill Yukhin