jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix x86_64 / upgrade libevent (#538)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/flipper/pull/538

Upgrades libevent to the August release 2.1.11.

Some notable things:

- The CMake file they ship with is actually broken. It contains a reference to an "uninstall.cmake" script that they don't include in the archive.
- There is some git magic in the CMake script which throws very annoying warnings if you're not in a git repository and if you are, it's still super useless because it assumes it's the libevent repo.
- I've removed the uninstall reference and replaced version detection magic with hardcoded values. The result is the "CMakeLists.txt" in the overrides folder. For future upgraders: You'll have to either remove the override or apply similar steps to the next release.
- The `event-config.h` is simply one of the outputs I found under `android/build/libevent/x86/include/event2/event-config.h`. They seem to be stable across architectures so it's easier to just copy it over than to fix the CMake logic that should actually pick it up from the Android build path.
- The cmake target names have changed and have an underscore in them, now.
- Verified with an SDK 28 x86_64 that this does fix https://github.com/facebook/flipper/issues/482.

Fixes GH482.

Reviewed By: jknoxville

Differential Revision: D17164731

fbshipit-source-id: 642744118065bea2674dbb0e1af91a11598066cc
This commit is contained in:
Pascal Hartig
2019-09-04 04:42:56 -07:00
committed by Facebook Github Bot
parent d2778e05f5
commit e6e070684c
9 changed files with 1811 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/CMakeLists.txt
View File

@@ -36,7 +36,7 @@ set(external_DIR ${PROJECT_SOURCE_DIR}/third-party/external)
set(libfolly_DIR ${external_DIR}/folly/) set(libfolly_DIR ${external_DIR}/folly/)
set(glog_DIR ${external_DIR}/glog) set(glog_DIR ${external_DIR}/glog)
set(BOOST_DIR ${external_DIR}/boost/boost_1_63_0/) set(BOOST_DIR ${external_DIR}/boost/boost_1_63_0/)
set(LIBEVENT_DIR ${external_DIR}/LibEvent/libevent-release-2.1.9/) set(LIBEVENT_DIR ${external_DIR}/LibEvent/libevent-2.1.11-stable/)
set(build_DIR ${CMAKE_SOURCE_DIR}/build) set(build_DIR ${CMAKE_SOURCE_DIR}/build)

4
android/build.gradle
View File

@@ -25,8 +25,8 @@ android {
externalNativeBuild { externalNativeBuild {
cmake { cmake {
arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_shared' arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_shared', '-DEVENT__DISABLE_OPENSSL=on'
targets 'flipper', 'event', 'event_extra', 'event_core' targets 'flipper', 'event_shared', 'event_extra_shared', 'event_core_shared'
} }
} }
} }

16
android/third-party/native.gradle vendored
View File

@@ -11,7 +11,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
// Increment this when making changes to any of the native // Increment this when making changes to any of the native
// dependencies. // dependencies.
// !!! // !!!
final def CACHE_REVISION = 28 final def CACHE_REVISION = 29
final def externalDir = new File("$projectDir/external") final def externalDir = new File("$projectDir/external")
final def downloadsDir = new File("$externalDir/downloads") final def downloadsDir = new File("$externalDir/downloads")
@@ -148,7 +148,7 @@ task finalizeFolly(dependsOn: [finalizeFollyWithDemangle], type: Copy) {
} }
task downloadLibEvent(dependsOn: [], type: Download) { task downloadLibEvent(dependsOn: [], type: Download) {
src 'https://github.com/priteshrnandgaonkar/libevent/archive/release-2.1.9.tar.gz' src 'https://github.com/libevent/libevent/releases/download/release-2.1.11-stable/libevent-2.1.11-stable.tar.gz'
onlyIfNewer true onlyIfNewer true
overwrite false overwrite false
dest new File(downloadsDir, 'libevent-' + getDownloadFileName(src)) dest new File(downloadsDir, 'libevent-' + getDownloadFileName(src))
@@ -158,16 +158,22 @@ task prepareLibEvent(dependsOn: [downloadLibEvent], type: Copy) {
onlyIf { isCacheOutOfDate(CACHE_REVISION) } onlyIf { isCacheOutOfDate(CACHE_REVISION) }
from tarTree(downloadLibEvent.dest) from tarTree(downloadLibEvent.dest)
from './overrides/LibEvent/' from './overrides/LibEvent/'
include 'libevent-release-2.1.9/**/*', 'build.gradle', 'ApplicationManifest.xml' include 'libevent-2.1.11-stable/**/*', 'build.gradle', 'ApplicationManifest.xml'
includeEmptyDirs = false includeEmptyDirs = false
into "$externalDir/LibEvent" into "$externalDir/LibEvent"
} }
task finalizeLibEvent(dependsOn: [prepareLibEvent], type: Copy) { task prepareLibEvent2(dependsOn: [prepareLibEvent], type: Copy) {
from './overrides/LibEvent/' from './overrides/LibEvent/'
include 'event-config.h' include 'event-config.h'
includeEmptyDirs = false includeEmptyDirs = false
into "$externalDir/LibEvent/libevent-release-2.1.9/include/event2/" into "$externalDir/LibEvent/libevent-2.1.11-stable/include/event2/"
}
task finalizeLibEvent(dependsOn: [prepareLibEvent2], type: Copy) {
from './overrides/LibEvent/'
include 'CMakeLists.txt'
into "$externalDir/LibEvent/libevent-2.1.11-stable/"
} }
task downloadOpenSSLSource(dependsOn: [], type: Download) { task downloadOpenSSLSource(dependsOn: [], type: Download) {

2
android/third-party/overrides/Folly/CMakeLists.txt vendored
View File

@@ -17,7 +17,7 @@ list(APPEND dir_list ${FOLLY_DIR}/memory/detail)
set(BOOST_DIR ../boost/boost_1_63_0/) set(BOOST_DIR ../boost/boost_1_63_0/)
set(GLOG_DIR ../glog/) set(GLOG_DIR ../glog/)
set(OPENSSL_DIR ../OpenSSL/openssl-1.1.0h/) set(OPENSSL_DIR ../OpenSSL/openssl-1.1.0h/)
set(LIBEVENT_DIR ../LibEvent/libevent-release-2.1.9/) set(LIBEVENT_DIR ../LibEvent/libevent-2.1.11-stable/)
set(DOUBLECONVERSION_DIR ../double-conversion/double-conversion-3.0.0/) set(DOUBLECONVERSION_DIR ../double-conversion/double-conversion-3.0.0/)
list(APPEND dir_list ${BOOST_DIR}) list(APPEND dir_list ${BOOST_DIR})

1518
android/third-party/overrides/LibEvent/CMakeLists.txt vendored Normal file
View File

File diff suppressed because it is too large Load Diff

4
android/third-party/overrides/LibEvent/build.gradle vendored
View File

@@ -16,7 +16,7 @@ android {
targetSdkVersion rootProject.targetSdkVersion targetSdkVersion rootProject.targetSdkVersion
externalNativeBuild { externalNativeBuild {
cmake { cmake {
arguments '-DANDROID_TOOLCHAIN=clang' arguments '-DANDROID_TOOLCHAIN=clang', '-DEVENT__DISABLE_OPENSSL=on'
} }
} }
} }
@@ -30,7 +30,7 @@ android {
} }
externalNativeBuild { externalNativeBuild {
cmake { cmake {
path 'libevent-release-2.1.9/CMakeLists.txt' path 'libevent-2.1.11-stable/CMakeLists.txt'
} }
} }
} }

406
android/third-party/overrides/LibEvent/event-config.h vendored
View File

@@ -1,16 +1,42 @@
/* event2/event-config.h /* event-config.h
* *
* This file was generated by autoconf when libevent was built, and post- * This file was generated by cmake when the makefiles were generated.
* processed by Libevent so that its macros would have a uniform prefix.
* *
* DO NOT EDIT THIS FILE. * DO NOT EDIT THIS FILE.
* *
* Do not rely on macros in this file existing in later versions. * Do not rely on macros in this file existing in later versions.
*/ */
#ifndef EVENT_CONFIG_H__ #ifndef EVENT2_EVENT_CONFIG_H_INCLUDED_
#define EVENT_CONFIG_H__ #define EVENT2_EVENT_CONFIG_H_INCLUDED_
/* config.h. Generated by configure. */
/* config.h.in. Generated from configure.in by autoheader. */ /* Numeric representation of the version */
#define EVENT__NUMERIC_VERSION 0x02010b00
#define EVENT__PACKAGE_VERSION "2.1.11"
#define EVENT__VERSION_MAJOR 2
#define EVENT__VERSION_MINOR 1
#define EVENT__VERSION_PATCH 11
/* Version number of package */
#define EVENT__VERSION "2.1.11-stable"
/* Name of package */
#define EVENT__PACKAGE "libevent"
/* Define to the address where bug reports for this package should be sent. */
#define EVENT__PACKAGE_BUGREPORT ""
/* Define to the full name of this package. */
#define EVENT__PACKAGE_NAME ""
/* Define to the full name and version of this package. */
#define EVENT__PACKAGE_STRING ""
/* Define to the one symbol short name of this package. */
#define EVENT__PACKAGE_TARNAME ""
/* Define if libevent should build without support for a debug mode */
/* #undef EVENT__DISABLE_DEBUG_MODE */
/* Define if libevent should not allow replacing the mm functions */ /* Define if libevent should not allow replacing the mm functions */
/* #undef EVENT__DISABLE_MM_REPLACEMENT */ /* #undef EVENT__DISABLE_MM_REPLACEMENT */
@@ -18,39 +44,75 @@
/* Define if libevent should not be compiled with thread support */ /* Define if libevent should not be compiled with thread support */
/* #undef EVENT__DISABLE_THREAD_SUPPORT */ /* #undef EVENT__DISABLE_THREAD_SUPPORT */
/* Define to 1 if you have the `accept4' function. */
/* #undef EVENT__HAVE_ACCEPT4 */
/* Define to 1 if you have the `arc4random' function. */
#define EVENT__HAVE_ARC4RANDOM 1
/* Define to 1 if you have the `arc4random_buf' function. */
#define EVENT__HAVE_ARC4RANDOM_BUF 1
/* Define to 1 if you have the `arc4random_addrandom' function. */
/* #undef EVENT__HAVE_ARC4RANDOM_ADDRANDOM */
/* Define if clock_gettime is available in libc */ /* Define if clock_gettime is available in libc */
/* #undef _EVENT_DNS_USE_CPU_CLOCK_FOR_ID */ #define EVENT__DNS_USE_CPU_CLOCK_FOR_ID 1
/* Define is no secure id variant is available */ /* Define is no secure id variant is available */
/* #define _EVENT_DNS_USE_GETTIMEOFDAY_FOR_ID 1 */ /* #undef EVENT__DNS_USE_GETTIMEOFDAY_FOR_ID */
#define EVENT_DNS_USE_FTIME_FOR_ID_ 1 /* #undef EVENT__DNS_USE_FTIME_FOR_ID */
/* Define to 1 if you have the <arpa/inet.h> header file. */ /* Define to 1 if you have the <arpa/inet.h> header file. */
/* #undef EVENT__HAVE_ARPA_INET_H */ #define EVENT__HAVE_ARPA_INET_H 1
/* Define to 1 if you have the `clock_gettime' function. */ /* Define to 1 if you have the `clock_gettime' function. */
/* #undef EVENT__HAVE_CLOCK_GETTIME */ #define EVENT__HAVE_CLOCK_GETTIME 1
/* Define to 1 if you have the declaration of `CTL_KERN'. */
#define EVENT__HAVE_DECL_CTL_KERN 0
/* Define to 1 if you have the declaration of `KERN_ARND'. */
#define EVENT__HAVE_DECL_KERN_ARND 0
/* Define to 1 if you have the declaration of `KERN_RANDOM'. */
#define EVENT__HAVE_DECL_KERN_RANDOM 0
/* Define to 1 if you have the declaration of `RANDOM_UUID'. */
#define EVENT__HAVE_DECL_RANDOM_UUID 0
/* Define if /dev/poll is available */ /* Define if /dev/poll is available */
/* #undef EVENT__HAVE_DEVPOLL */ /* #undef EVENT__HAVE_DEVPOLL */
/* Define to 1 if you have the <netdb.h> header file. */
#define EVENT__HAVE_NETDB_H 1
/* Define to 1 if fd_mask type is defined */
/* #undef EVENT__HAVE_FD_MASK */
/* Define to 1 if the <sys/queue.h> header file defines TAILQ_FOREACH. */
#define EVENT__HAVE_TAILQFOREACH 1
/* Define to 1 if you have the <dlfcn.h> header file. */ /* Define to 1 if you have the <dlfcn.h> header file. */
/* #undef EVENT__HAVE_DLFCN_H */ #define EVENT__HAVE_DLFCN_H 1
/* Define if your system supports the epoll system calls */ /* Define if your system supports the epoll system calls */
/* #undef EVENT__HAVE_EPOLL */ #define EVENT__HAVE_EPOLL 1
/* Define to 1 if you have the `epoll_create1' function. */
/* #undef EVENT__HAVE_EPOLL_CREATE1 */
/* Define to 1 if you have the `epoll_ctl' function. */ /* Define to 1 if you have the `epoll_ctl' function. */
/* #undef EVENT__HAVE_EPOLL_CTL */ #define EVENT__HAVE_EPOLL_CTL 1
/* Define to 1 if you have the `eventfd' function. */ /* Define to 1 if you have the `eventfd' function. */
/* #undef EVENT__HAVE_EVENTFD */ #define EVENT__HAVE_EVENTFD 1
/* Define if your system supports event ports */ /* Define if your system supports event ports */
/* #undef EVENT__HAVE_EVENT_PORTS */ /* #undef EVENT__HAVE_EVENT_PORTS */
/* Define to 1 if you have the `fcntl' function. */ /* Define to 1 if you have the `fcntl' function. */
/* #undef EVENT__HAVE_FCNTL */ #define EVENT__HAVE_FCNTL 1
/* Define to 1 if you have the <fcntl.h> header file. */ /* Define to 1 if you have the <fcntl.h> header file. */
#define EVENT__HAVE_FCNTL_H 1 #define EVENT__HAVE_FCNTL_H 1
@@ -58,6 +120,28 @@
/* Define to 1 if you have the `getaddrinfo' function. */ /* Define to 1 if you have the `getaddrinfo' function. */
#define EVENT__HAVE_GETADDRINFO 1 #define EVENT__HAVE_GETADDRINFO 1
/* Define to 1 if you have the `getegid' function. */
#define EVENT__HAVE_GETEGID 1
/* Define to 1 if you have the `geteuid' function. */
#define EVENT__HAVE_GETEUID 1
/* TODO: Check for different gethostname argument counts. CheckPrototypeDefinition.cmake can be used. */
/* Define this if you have any gethostbyname_r() */
#define EVENT__HAVE_GETHOSTBYNAME_R 1
/* Define this if gethostbyname_r takes 3 arguments */
/* #undef EVENT__HAVE_GETHOSTBYNAME_R_3_ARG */
/* Define this if gethostbyname_r takes 5 arguments */
/* #undef EVENT__HAVE_GETHOSTBYNAME_R_5_ARG */
/* Define this if gethostbyname_r takes 6 arguments */
#define EVENT__HAVE_GETHOSTBYNAME_R_6_ARG 1
/* Define to 1 if you have the `getifaddrs' function. */
/* #undef EVENT__HAVE_GETIFADDRS */
/* Define to 1 if you have the `getnameinfo' function. */ /* Define to 1 if you have the `getnameinfo' function. */
#define EVENT__HAVE_GETNAMEINFO 1 #define EVENT__HAVE_GETNAMEINFO 1
@@ -68,43 +152,76 @@
#define EVENT__HAVE_GETSERVBYNAME 1 #define EVENT__HAVE_GETSERVBYNAME 1
/* Define to 1 if you have the `gettimeofday' function. */ /* Define to 1 if you have the `gettimeofday' function. */
/* #define EVENT__HAVE_GETTIMEOFDAY 1 */ #define EVENT__HAVE_GETTIMEOFDAY 1
/* Define to 1 if you have the <ifaddrs.h> header file. */
#define EVENT__HAVE_IFADDRS_H 1
/* Define to 1 if you have the `inet_ntop' function. */ /* Define to 1 if you have the `inet_ntop' function. */
/* #undef EVENT__HAVE_INET_NTOP */ #define EVENT__HAVE_INET_NTOP 1
/* Define to 1 if you have the `inet_pton' function. */ /* Define to 1 if you have the `inet_pton' function. */
/* #undef EVENT__HAVE_INET_PTON */ #define EVENT__HAVE_INET_PTON 1
/* Define to 1 if you have the <inttypes.h> header file. */ /* Define to 1 if you have the <inttypes.h> header file. */
/* #define EVENT__HAVE_INTTYPES_H 1 */ #define EVENT__HAVE_INTTYPES_H 1
/* Define to 1 if you have the `issetugid' function. */
/* #undef EVENT__HAVE_ISSETUGID */
/* Define to 1 if you have the `kqueue' function. */ /* Define to 1 if you have the `kqueue' function. */
/* #undef EVENT__HAVE_KQUEUE */ /* #undef EVENT__HAVE_KQUEUE */
/* Define if the system has zlib */ /* Define if the system has zlib */
/* #undef EVENT__HAVE_LIBZ */ #define EVENT__HAVE_LIBZ 1
/* Define to 1 if you have the `mach_absolute_time' function. */
/* #undef EVENT__HAVE_MACH_ABSOLUTE_TIME */
/* Define to 1 if you have the <mach/mach_time.h> header file. */
/* #undef EVENT__HAVE_MACH_MACH_TIME_H */
/* Define to 1 if you have the <memory.h> header file. */ /* Define to 1 if you have the <memory.h> header file. */
#define EVENT__HAVE_MEMORY_H 1 #define EVENT__HAVE_MEMORY_H 1
/* Define to 1 if you have the `mmap' function. */ /* Define to 1 if you have the `mmap' function. */
/* #undef EVENT__HAVE_MMAP */ #define EVENT__HAVE_MMAP 1
/* Define to 1 if you have the `nanosleep' function. */
#define EVENT__HAVE_NANOSLEEP 1
/* Define to 1 if you have the `usleep' function. */
#define EVENT__HAVE_USLEEP 1
/* Define to 1 if you have the <netinet/in6.h> header file. */ /* Define to 1 if you have the <netinet/in6.h> header file. */
/* #undef EVENT__HAVE_NETINET_IN6_H */ #define EVENT__HAVE_NETINET_IN6_H 1
/* Define to 1 if you have the <netinet/in.h> header file. */ /* Define to 1 if you have the <netinet/in.h> header file. */
/* #undef EVENT__HAVE_NETINET_IN_H */ #define EVENT__HAVE_NETINET_IN_H 1
/* Define to 1 if you have the <netinet/tcp.h> header file. */
#define EVENT__HAVE_NETINET_TCP_H 1
/* Define to 1 if you have the <sys/un.h> header file. */
#define EVENT__HAVE_SYS_UN_H 1
/* Define to 1 if you have the <afunix.h> header file. */
/* #undef EVENT__HAVE_AFUNIX_H */
/* Define if the system has openssl */
/* #undef EVENT__HAVE_OPENSSL */
/* Define to 1 if you have the `pipe' function. */ /* Define to 1 if you have the `pipe' function. */
/* #undef EVENT__HAVE_PIPE */ #define EVENT__HAVE_PIPE 1
/* Define to 1 if you have the `pipe2' function. */
#define EVENT__HAVE_PIPE2 1
/* Define to 1 if you have the `poll' function. */ /* Define to 1 if you have the `poll' function. */
/* #undef EVENT__HAVE_POLL */ #define EVENT__HAVE_POLL 1
/* Define to 1 if you have the <poll.h> header file. */ /* Define to 1 if you have the <poll.h> header file. */
/* #undef EVENT__HAVE_POLL_H */ #define EVENT__HAVE_POLL_H 1
/* Define to 1 if you have the `port_create' function. */ /* Define to 1 if you have the `port_create' function. */
/* #undef EVENT__HAVE_PORT_CREATE */ /* #undef EVENT__HAVE_PORT_CREATE */
@@ -112,29 +229,35 @@
/* Define to 1 if you have the <port.h> header file. */ /* Define to 1 if you have the <port.h> header file. */
/* #undef EVENT__HAVE_PORT_H */ /* #undef EVENT__HAVE_PORT_H */
/* Define if you have POSIX threads libraries and header files. */
/* #undef EVENT__HAVE_PTHREAD */
/* Define if we have pthreads on this system */ /* Define if we have pthreads on this system */
/* #undef EVENT__HAVE_PTHREADS */ #define EVENT__HAVE_PTHREADS 1
/* Define to 1 if you have the `putenv' function. */
#define EVENT__HAVE_PUTENV 1
/* Define to 1 if the system has the type `sa_family_t'. */ /* Define to 1 if the system has the type `sa_family_t'. */
/* #undef EVENT__HAVE_SA_FAMILY_T */ #define EVENT__HAVE_SA_FAMILY_T 1
/* Define to 1 if you have the `select' function. */ /* Define to 1 if you have the `select' function. */
/* #undef EVENT__HAVE_SELECT */ #define EVENT__HAVE_SELECT 1
/* Define to 1 if you have the `sendfile' function. */ /* Define to 1 if you have the `setenv' function. */
/* #undef EVENT__HAVE_SENDFILE */ #define EVENT__HAVE_SETENV 1
/* Define if F_SETFD is defined in <fcntl.h> */ /* Define if F_SETFD is defined in <fcntl.h> */
/* #undef EVENT__HAVE_SETFD */ #define EVENT__HAVE_SETFD 1
/* Define to 1 if you have the `setrlimit' function. */
#define EVENT__HAVE_SETRLIMIT 1
/* Define to 1 if you have the `sendfile' function. */
#define EVENT__HAVE_SENDFILE 1
/* Define to 1 if you have the `sigaction' function. */ /* Define to 1 if you have the `sigaction' function. */
/* #undef EVENT__HAVE_SIGACTION */ #define EVENT__HAVE_SIGACTION 1
/* Define to 1 if you have the `signal' function. */ /* Define to 1 if you have the `signal' function. */
#define EVENT__HAVE_SIGNAL 1 /* #undef EVENT__HAVE_SIGNAL */
/* Define to 1 if you have the `splice' function. */ /* Define to 1 if you have the `splice' function. */
/* #undef EVENT__HAVE_SPLICE */ /* #undef EVENT__HAVE_SPLICE */
@@ -146,7 +269,7 @@
#define EVENT__HAVE_STDDEF_H 1 #define EVENT__HAVE_STDDEF_H 1
/* Define to 1 if you have the <stdint.h> header file. */ /* Define to 1 if you have the <stdint.h> header file. */
/* #define EVENT__HAVE_STDINT_H 1 */ #define EVENT__HAVE_STDINT_H 1
/* Define to 1 if you have the <stdlib.h> header file. */ /* Define to 1 if you have the <stdlib.h> header file. */
#define EVENT__HAVE_STDLIB_H 1 #define EVENT__HAVE_STDLIB_H 1
@@ -158,17 +281,18 @@
#define EVENT__HAVE_STRING_H 1 #define EVENT__HAVE_STRING_H 1
/* Define to 1 if you have the `strlcpy' function. */ /* Define to 1 if you have the `strlcpy' function. */
/* #undef EVENT__HAVE_STRLCPY */ #define EVENT__HAVE_STRLCPY 1
/* Define to 1 if you have the `strsep' function. */ /* Define to 1 if you have the `strsep' function. */
/* #undef EVENT__HAVE_STRSEP */ #define EVENT__HAVE_STRSEP 1
/* Define to 1 if you have the `strtok_r' function. */ /* Define to 1 if you have the `strtok_r' function. */
/* #undef EVENT__HAVE_STRTOK_R */ #define EVENT__HAVE_STRTOK_R 1
/* Define to 1 if you have the `strtoll' function. */ /* Define to 1 if you have the `strtoll' function. */
/* #define EVENT__HAVE_STRTOLL 1 */ #define EVENT__HAVE_STRTOLL 1
/* Define to 1 if the system has the type `struct addrinfo'. */
#define EVENT__HAVE_STRUCT_ADDRINFO 1 #define EVENT__HAVE_STRUCT_ADDRINFO 1
/* Define to 1 if the system has the type `struct in6_addr'. */ /* Define to 1 if the system has the type `struct in6_addr'. */
@@ -189,114 +313,138 @@
/* Define to 1 if `sin_len' is member of `struct sockaddr_in'. */ /* Define to 1 if `sin_len' is member of `struct sockaddr_in'. */
/* #undef EVENT__HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */ /* #undef EVENT__HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
/* Define to 1 if the system has the type `struct sockaddr_un'. */
#define EVENT__HAVE_STRUCT_SOCKADDR_UN 1
/* Define to 1 if the system has the type `struct sockaddr_storage'. */ /* Define to 1 if the system has the type `struct sockaddr_storage'. */
#define EVENT__HAVE_STRUCT_SOCKADDR_STORAGE 1 #define EVENT__HAVE_STRUCT_SOCKADDR_STORAGE 1
/* Define to 1 if you have the <sys/devpoll.h> header file. */ /* Define to 1 if `ss_family' is a member of `struct sockaddr_storage'. */
/* #undef EVENT__HAVE_SYS_DEVPOLL_H */ #define EVENT__HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1
/* Define to 1 if `__ss_family' is a member of `struct sockaddr_storage'. */
/* #undef EVENT__HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY */
/* Define to 1 if the system has the type `struct linger'. */
#define EVENT__HAVE_STRUCT_LINGER 1
/* Define to 1 if you have the `sysctl' function. */
/* #undef EVENT__HAVE_SYSCTL */
/* Define to 1 if you have the <sys/epoll.h> header file. */ /* Define to 1 if you have the <sys/epoll.h> header file. */
/* #undef EVENT__HAVE_SYS_EPOLL_H */ #define EVENT__HAVE_SYS_EPOLL_H 1
/* Define to 1 if you have the <sys/eventfd.h> header file. */ /* Define to 1 if you have the <sys/eventfd.h> header file. */
/* #undef EVENT__HAVE_SYS_EVENTFD_H */ #define EVENT__HAVE_SYS_EVENTFD_H 1
/* Define to 1 if you have the <sys/event.h> header file. */ /* Define to 1 if you have the <sys/event.h> header file. */
/* #undef EVENT__HAVE_SYS_EVENT_H */ /* #undef EVENT__HAVE_SYS_EVENT_H */
/* Define to 1 if you have the <sys/ioctl.h> header file. */ /* Define to 1 if you have the <sys/ioctl.h> header file. */
/* #undef EVENT__HAVE_SYS_IOCTL_H */ #define EVENT__HAVE_SYS_IOCTL_H 1
/* Define to 1 if you have the <sys/mman.h> header file. */ /* Define to 1 if you have the <sys/mman.h> header file. */
/* #undef EVENT__HAVE_SYS_MMAN_H */ #define EVENT__HAVE_SYS_MMAN_H 1
/* Define to 1 if you have the <sys/param.h> header file. */ /* Define to 1 if you have the <sys/param.h> header file. */
/* #define EVENT__HAVE_SYS_PARAM_H 1 */ #define EVENT__HAVE_SYS_PARAM_H 1
/* Define to 1 if you have the <sys/queue.h> header file. */ /* Define to 1 if you have the <sys/queue.h> header file. */
/* #undef EVENT__HAVE_SYS_QUEUE_H */ #define EVENT__HAVE_SYS_QUEUE_H 1
/* Define to 1 if you have the <sys/resource.h> header file. */
#define EVENT__HAVE_SYS_RESOURCE_H 1
/* Define to 1 if you have the <sys/select.h> header file. */ /* Define to 1 if you have the <sys/select.h> header file. */
/* #undef EVENT__HAVE_SYS_SELECT_H */ #define EVENT__HAVE_SYS_SELECT_H 1
/* Define to 1 if you have the <sys/sendfile.h> header file. */ /* Define to 1 if you have the <sys/sendfile.h> header file. */
/* #undef EVENT__HAVE_SYS_SENDFILE_H */ #define EVENT__HAVE_SYS_SENDFILE_H 1
/* Define to 1 if you have the <sys/socket.h> header file. */ /* Define to 1 if you have the <sys/socket.h> header file. */
/* #undef EVENT__HAVE_SYS_SOCKET_H */ #define EVENT__HAVE_SYS_SOCKET_H 1
/* Define to 1 if you have the <sys/stat.h> header file. */ /* Define to 1 if you have the <sys/stat.h> header file. */
#define EVENT__HAVE_SYS_STAT_H 1 #define EVENT__HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/sysctl.h> header file. */
/* #undef EVENT__HAVE_SYS_SYSCTL_H */
/* Define to 1 if you have the <sys/timerfd.h> header file. */
#define EVENT__HAVE_SYS_TIMERFD_H 1
/* Define to 1 if you have the <sys/time.h> header file. */ /* Define to 1 if you have the <sys/time.h> header file. */
/* #define EVENT__HAVE_SYS_TIME_H 1 */ #define EVENT__HAVE_SYS_TIME_H 1
/* Define to 1 if you have the <sys/types.h> header file. */ /* Define to 1 if you have the <sys/types.h> header file. */
#define EVENT__HAVE_SYS_TYPES_H 0 #define EVENT__HAVE_SYS_TYPES_H 1
/* Define to 1 if you have the <sys/uio.h> header file. */ /* Define to 1 if you have the <sys/uio.h> header file. */
/* #undef EVENT__HAVE_SYS_UIO_H */ #define EVENT__HAVE_SYS_UIO_H 1
/* Define to 1 if you have the <sys/wait.h> header file. */
#define EVENT__HAVE_SYS_WAIT_H 1
/* Define to 1 if you have the <errno.h> header file. */
#define EVENT__HAVE_ERRNO_H 1
/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */ /* Define if TAILQ_FOREACH is defined in <sys/queue.h> */
/* #undef EVENT__HAVE_TAILQFOREACH */ #define EVENT__HAVE_TAILQFOREACH 1
/* Define if timeradd is defined in <sys/time.h> */ /* Define if timeradd is defined in <sys/time.h> */
/* #undef EVENT__HAVE_TIMERADD */ /* #undef EVENT__HAVE_TIMERADD */
/* Define if timerclear is defined in <sys/time.h> */ /* Define if timerclear is defined in <sys/time.h> */
#define EVENT__HAVE_TIMERCLEAR 1 /* #undef EVENT__HAVE_TIMERCLEAR */
/* Define if timercmp is defined in <sys/time.h> */ /* Define if timercmp is defined in <sys/time.h> */
#define EVENT__HAVE_TIMERCMP 1 /* #undef EVENT__HAVE_TIMERCMP */
/* Define to 1 if you have the `timerfd_create' function. */
/* #undef EVENT__HAVE_TIMERFD_CREATE */
/* Define if timerisset is defined in <sys/time.h> */ /* Define if timerisset is defined in <sys/time.h> */
#define EVENT__HAVE_TIMERISSET 1 /* #undef EVENT__HAVE_TIMERISSET */
/* Define to 1 if the system has the type `uint16_t'. */
/* #define EVENT__HAVE_UINT16_T 1 */
/* Define to 1 if the system has the type `uint32_t'. */
/* #define EVENT__HAVE_UINT32_T 1 */
/* Define to 1 if the system has the type `uint64_t'. */
/* #define EVENT__HAVE_UINT64_T 1 */
/* Define to 1 if the system has the type `uint8_t'. */ /* Define to 1 if the system has the type `uint8_t'. */
/* #define EVENT__HAVE_UINT8_T 1 */ #define EVENT__HAVE_UINT8_T 1
/* Define to 1 if the system has the type `uint16_t'. */
#define EVENT__HAVE_UINT16_T 1
/* Define to 1 if the system has the type `uint32_t'. */
#define EVENT__HAVE_UINT32_T 1
/* Define to 1 if the system has the type `uint64_t'. */
#define EVENT__HAVE_UINT64_T 1
/* Define to 1 if the system has the type `uintptr_t'. */
#define EVENT__HAVE_UINTPTR_T 1
/* Define to 1 if you have the `umask' function. */
#define EVENT__HAVE_UMASK 1
/* Define to 1 if you have the <unistd.h> header file. */ /* Define to 1 if you have the <unistd.h> header file. */
/* #define EVENT__HAVE_UNISTD_H 1 */ #define EVENT__HAVE_UNISTD_H 1
/* Define to 1 if you have the `unsetenv' function. */
#define EVENT__HAVE_UNSETENV 1
/* Define to 1 if you have the `vasprintf' function. */ /* Define to 1 if you have the `vasprintf' function. */
/* #undef EVENT__HAVE_VASPRINTF */ #define EVENT__HAVE_VASPRINTF 1
/* Define if kqueue works correctly with pipes */ /* Define if kqueue works correctly with pipes */
/* #undef EVENT__HAVE_WORKING_KQUEUE */ /* #undef EVENT__HAVE_WORKING_KQUEUE */
/* Numeric representation of the version */ #ifdef __USE_UNUSED_DEFINITIONS__
#define EVENT__NUMERIC_VERSION 0x02020001 /* Define to necessary symbol if this constant uses a non-standard name on your system. */
/* XXX: Hello, this isn't even used, nor is it defined anywhere... - Ellzey */
#define EVENT__PTHREAD_CREATE_JOINABLE
#endif
/* Name of package */ /* The size of `pthread_t', as computed by sizeof. */
#define EVENT__PACKAGE "libevent" #define EVENT__SIZEOF_PTHREAD_T 4
/* Define to the address where bug reports for this package should be sent. */
#define EVENT__PACKAGE_BUGREPORT ""
/* Define to the full name of this package. */
#define EVENT__PACKAGE_NAME ""
/* Define to the full name and version of this package. */
#define EVENT__PACKAGE_STRING ""
/* Define to the one symbol short name of this package. */
#define EVENT__PACKAGE_TARNAME ""
/* Define to the version of this package. */
#define EVENT__PACKAGE_VERSION ""
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
/* #undef EVENT__PTHREAD_CREATE_JOINABLE */
/* The size of a `int', as computed by sizeof. */ /* The size of a `int', as computed by sizeof. */
#define EVENT__SIZEOF_INT 4 #define EVENT__SIZEOF_INT 4
@@ -307,59 +455,53 @@
/* The size of a `long long', as computed by sizeof. */ /* The size of a `long long', as computed by sizeof. */
#define EVENT__SIZEOF_LONG_LONG 8 #define EVENT__SIZEOF_LONG_LONG 8
/* The size of `off_t', as computed by sizeof. */
#define EVENT__SIZEOF_OFF_T 4
#define EVENT__SIZEOF_SSIZE_T 4
/* The size of a `short', as computed by sizeof. */ /* The size of a `short', as computed by sizeof. */
#define EVENT__SIZEOF_SHORT 2 #define EVENT__SIZEOF_SHORT 2
/* The size of `size_t', as computed by sizeof. */ /* The size of `size_t', as computed by sizeof. */
#ifdef _WIN64
#define EVENT__SIZEOF_SIZE_T 8
#else
#define EVENT__SIZEOF_SIZE_T 4 #define EVENT__SIZEOF_SIZE_T 4
#endif
/* The size of `void *', as computed by sizeof. */
#ifdef _WIN64
#define EVENT__SIZEOF_VOID_P 8
#else
#define EVENT__SIZEOF_VOID_P 4
#endif
/* The size of `time_t`, as computed by sizeof. */
#ifdef _WIN64
#define EVENT__SIZEOF_TIME_T 8
#else
#define EVENT__SIZEOF_TIME_T 4
#endif
/* Define to 1 if you have the ANSI C header files. */
#define EVENT__STDC_HEADERS 1
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#define EVENT__TIME_WITH_SYS_TIME 1 /* #undef EVENT__TIME_WITH_SYS_TIME */
/* Version number of package */ /* The size of `socklen_t', as computed by sizeof. */
#define EVENT__VERSION "2.2.0-alpha-dev" #define EVENT__SIZEOF_SOCKLEN_T 4
/* Define to appropriate substitue if compiler doesnt have __func__ */ /* The size of 'void *', as computer by sizeof */
#define EVENT____func__ __FUNCTION__ #define EVENT__SIZEOF_VOID_P 4
/* Define to `__inline__' or `__inline' if that's what the C compiler /* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */ calls it, or to nothing if 'inline' is not supported under any name. */
#ifndef _EVENT___cplusplus #ifndef __cplusplus
#define EVENT__inline __inline /* why not c++?
*
* and are we really expected to use EVENT__inline everywhere,
* shouldn't we just do:
* ifdef EVENT__inline
* define inline EVENT__inline
*
* - Ellzey
*/
#define EVENT__inline inline
#endif #endif
/* Define to `int' if <sys/types.h> does not define. */ #define EVENT__HAVE___func__ 1
#undef EVENT__pid_t #define EVENT__HAVE___FUNCTION__ 1
/* Define to `unsigned' if <sys/types.h> does not define. */ /* Define to `unsigned' if <sys/types.h> does not define. */
#undef EVENT__size_t #define EVENT__size_t size_t
/* Define to unsigned int if you dont have it */ /* Define to unsigned int if you dont have it */
#define EVENT__socklen_t unsigned int #define EVENT__socklen_t socklen_t
/* Define to `int' if <sys/types.h> does not define. */ /* Define to `int' if <sys/types.h> does not define. */
#define EVENT__ssize_t int #define EVENT__ssize_t ssize_t
//SSIZE_T
#endif #endif /* \EVENT2_EVENT_CONFIG_H_INCLUDED_ */

2
android/third-party/overrides/RSocket/CMakeLists.txt vendored
View File

@@ -10,7 +10,7 @@ set(third_party_ndk ${PROJECT_SOURCE_DIR}/../)
set(libfolly_DIR ${third_party_ndk}/folly/) set(libfolly_DIR ${third_party_ndk}/folly/)
set(glog_DIR ${third_party_ndk}/glog) set(glog_DIR ${third_party_ndk}/glog)
set(BOOST_DIR ${third_party_ndk}/boost/boost_1_63_0/) set(BOOST_DIR ${third_party_ndk}/boost/boost_1_63_0/)
set(LIBEVENT_DIR ${third_party_ndk}/LibEvent/libevent-release-2.1.9/) set(LIBEVENT_DIR ${third_party_ndk}/LibEvent/libevent-2.1.11-stable/)
set(DOUBLECONVERSION_DIR ${third_party_ndk}/double-conversion/double-conversion-3.0.0/) set(DOUBLECONVERSION_DIR ${third_party_ndk}/double-conversion/double-conversion-3.0.0/)
set(OPENSSL_DIR ${third_party_ndk}/OpenSSL/openssl-1.1.0h/) set(OPENSSL_DIR ${third_party_ndk}/OpenSSL/openssl-1.1.0h/)

2
xplat/CMakeLists.txt
View File

@@ -11,7 +11,7 @@ set(rsocket_DIR ${external_DIR}/RSocket/)
set(easywsclient_DIR ../libs/) set(easywsclient_DIR ../libs/)
set(glog_DIR ${external_DIR}/glog) set(glog_DIR ${external_DIR}/glog)
set(BOOST_DIR ${external_DIR}/boost/boost_1_63_0/) set(BOOST_DIR ${external_DIR}/boost/boost_1_63_0/)
set(LIBEVENT_DIR ${external_DIR}/LibEvent/libevent-release-2.1.9/) set(LIBEVENT_DIR ${external_DIR}/LibEvent/libevent-2.1.11-stable/)
set(DOUBLECONVERSION_DIR ${external_DIR}/double-conversion/double-conversion-3.0.0/) set(DOUBLECONVERSION_DIR ${external_DIR}/double-conversion/double-conversion-3.0.0/)
set(OPENSSL_DIR ${external_DIR}/OpenSSL/openssl-1.1.0h/) set(OPENSSL_DIR ${external_DIR}/OpenSSL/openssl-1.1.0h/)