mirror of
https://github.com/VCMP-SqMod/SqMod.git
synced 2026-10-06 13:47:11 +02:00
Update ZMQ to current git.
This commit is contained in:
1 parent
b78b3e8ede
commit
fa4644d00f
72 files changed
+1309
-884
No files matched your search
Vendored
+2
-2
@@ -7,10 +7,10 @@ You need the Android Native Development Kit (NDK) installed. See
|
||||
|
||||
This project is tested against Android NDK version r21d.
|
||||
|
||||
If you installed version r21d all you have to do is to expose the NDK root
|
||||
If you installed version r21e all you have to do is to expose the NDK root
|
||||
directory as environment variable, e.g:
|
||||
|
||||
export ANDROID_NDK_ROOT=$HOME/android-ndk-r21d
|
||||
export ANDROID_NDK_ROOT=$HOME/android-ndk-r21e
|
||||
|
||||
If you installed another version you have to expose the NDK root directory as
|
||||
well as the NDK version, e.g:
|
||||
|
||||
Vendored
+2
-2
@@ -35,8 +35,8 @@ esac
|
||||
|
||||
# Set default values used in ci builds
|
||||
|
||||
export NDK_VERSION=${NDK_VERSION:-android-ndk-r21d}
|
||||
# With NDK r21d, the minimum SDK version range is [16, 29].
|
||||
export NDK_VERSION=${NDK_VERSION:-android-ndk-r21e}
|
||||
# With NDK r21e, the minimum SDK version range is [16, 29].
|
||||
# SDK version 21 is the minimum version for 64-bit builds.
|
||||
export MIN_SDK_VERSION=${MIN_SDK_VERSION:-21}
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
export NDK_VERSION=android-ndk-r21d
|
||||
export NDK_VERSION=android-ndk-r21e
|
||||
export ANDROID_NDK_ROOT="/tmp/${NDK_VERSION}"
|
||||
|
||||
case $(uname | tr '[:upper:]' '[:lower:]') in
|
||||
|
||||
+2
@@ -16,6 +16,7 @@
|
||||
#cmakedefine ZMQ_POLL_BASED_ON_SELECT
|
||||
#cmakedefine ZMQ_POLL_BASED_ON_POLL
|
||||
|
||||
#cmakedefine HAVE_POSIX_MEMALIGN @HAVE_POSIX_MEMALIGN@
|
||||
#cmakedefine ZMQ_CACHELINE_SIZE @ZMQ_CACHELINE_SIZE@
|
||||
|
||||
#cmakedefine ZMQ_FORCE_MUTEXES
|
||||
@@ -35,6 +36,7 @@
|
||||
|
||||
#cmakedefine ZMQ_HAVE_SO_PEERCRED
|
||||
#cmakedefine ZMQ_HAVE_LOCAL_PEERCRED
|
||||
#cmakedefine ZMQ_HAVE_BUSY_POLL
|
||||
|
||||
#cmakedefine ZMQ_HAVE_O_CLOEXEC
|
||||
|
||||
|
||||
Vendored
+3
-1
@@ -84,7 +84,9 @@ do
|
||||
--prefix=${BUILDARCHDIR} \
|
||||
--disable-shared \
|
||||
--enable-static \
|
||||
--host=${HOST}
|
||||
--host=${HOST} \
|
||||
--disable-perf \
|
||||
--disable-curve-keygen
|
||||
|
||||
echo "Building ${LIBNAME} for ${ARCH}..."
|
||||
cd ${LIBDIR}
|
||||
|
||||
Reference in new issue
Block a user