Merge pull request #2157 from minrk/libsodium

bundle libsodium 1.0.21

Author: minrk

.github/workflows/test.yml

@@ -218,8 +218,8 @@ jobs:
           pushd libzmq-*
           ./autogen.sh
           ./configure --enable-drafts
-          make -j4
-          sudo make install
+          make -j4 src/libzmq.la
+          sudo make install-libLTLIBRARIES install-includeHEADERS
           sudo ldconfig
           popd
           echo "ZMQ_PREFIX=/usr/local" >> "$GITHUB_ENV"

CMakeLists.txt

@@ -36,7 +36,7 @@ option(PYZMQ_LIBZMQ_RPATH "Add $ZMQ_PREFIX/lib to $RPATH (true by default). Set
 # anything new should start with PYZMQ_
 option(PYZMQ_NO_BUNDLE "Prohibit building bundled libzmq. Useful for repackaging, to allow default search for libzmq and requiring it to succeed." OFF)
 set(PYZMQ_LIBZMQ_VERSION "4.3.5" CACHE STRING "libzmq version when bundling")
-set(PYZMQ_LIBSODIUM_VERSION "1.0.20" CACHE STRING "libsodium version when bundling")
+set(PYZMQ_LIBSODIUM_VERSION "1.0.21-stable" CACHE STRING "libsodium version when bundling")
 set(PYZMQ_LIBZMQ_URL "" CACHE STRING "full URL to download bundled libzmq")
 set(PYZMQ_LIBSODIUM_URL "" CACHE STRING "full URL to download bundled libsodium")
 set(PYZMQ_LIBSODIUM_CONFIGURE_ARGS "" CACHE STRING "semicolon-separated list of arguments to pass to ./configure for bundled libsodium")
@@ -91,7 +91,7 @@ if(ZMQ_DRAFT_API)
 endif()
 
 if (PYZMQ_LIBSODIUM_VERSION AND NOT PYZMQ_LIBSODIUM_URL)
-  set(PYZMQ_LIBSODIUM_URL "https://github.com/jedisct1/libsodium/releases/download/${PYZMQ_LIBSODIUM_VERSION}-RELEASE/libsodium-${PYZMQ_LIBSODIUM_VERSION}.tar.gz")
+  set(PYZMQ_LIBSODIUM_URL "https://download.libsodium.org/libsodium/releases/libsodium-${PYZMQ_LIBSODIUM_VERSION}.tar.gz")
 endif()
 
 if (PYZMQ_LIBZMQ_VERSION AND NOT PYZMQ_LIBZMQ_URL)

buildutils/bundle.py

@@ -12,7 +12,7 @@
 repo_root = buildutils.parent.resolve()
 licenses = repo_root / "licenses"
 
-bundled_libsodium_version = "1.0.20"
+bundled_libsodium_version = "1.0.21"
 bundled_version = "4.3.5"
 
 

tools/install_libzmq.sh

@@ -1,12 +1,15 @@
 #!/usr/bin/env bash
 # script to install libzmq/libsodium for use in wheels
 set -ex
+CPU_COUNT=${CPU_COUNT:-4}
 LIBSODIUM_VERSION=$(python buildutils/bundle.py libsodium)
 LIBZMQ_VERSION=$(python buildutils/bundle.py)
 PYZMQ_DIR="$PWD"
 LICENSE_DIR="$PYZMQ_DIR/licenses"
 test -d "$LICENSE_DIR" || mkdir "$LICENSE_DIR"
 SHLIB_EXT=".so"
+python3 buildutils/bundle.py licenses
+
 if [[ "$(uname)" == "Darwin" ]]; then
     SHLIB_EXT=".dylib"
     # make sure deployment target is set
@@ -54,15 +57,14 @@ fi
 # add rpath so auditwheel patches it
 export LDFLAGS="${LDFLAGS} -Wl,-rpath,$PREFIX/lib"
 
-curl -L -O "https://github.com/jedisct1/libsodium/releases/download/${LIBSODIUM_VERSION}-RELEASE/libsodium-${LIBSODIUM_VERSION}.tar.gz"
+curl -L -O "https://download.libsodium.org/libsodium/releases/libsodium-${LIBSODIUM_VERSION}-stable.tar.gz"
 
 curl -L -O "https://github.com/zeromq/libzmq/releases/download/v${LIBZMQ_VERSION}/zeromq-${LIBZMQ_VERSION}.tar.gz"
 
-tar -xzf libsodium-${LIBSODIUM_VERSION}.tar.gz
+tar -xzf libsodium-${LIBSODIUM_VERSION}*.tar.gz
 cd libsodium-*/
-cp LICENSE "${LICENSE_DIR}/LICENSE.libsodium.txt"
 ./configure --prefix="$PREFIX"
-make -j4
+make -j${CPU_COUNT}
 make install
 
 cd ..
@@ -74,12 +76,12 @@ export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig
 
 tar -xzf zeromq-${LIBZMQ_VERSION}.tar.gz
 cd zeromq-${LIBZMQ_VERSION}
-cp LICENSE "${LICENSE_DIR}/LICENSE.zeromq.txt"
 # avoid error on warning
 export CXXFLAGS="-Wno-error ${CXXFLAGS:-}"
 
 ./configure --prefix="$PREFIX" --disable-perf --without-docs --enable-curve --with-libsodium --disable-drafts --disable-libsodium_randombytes_close
-make -j4
-make install
+# only build libzmq, not unused tests
+make -j${CPU_COUNT} src/libzmq.la
+make install-libLTLIBRARIES install-includeHEADERS
 
 which ldconfig && ldconfig || true