This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git
The following commit(s) were added to refs/heads/main by this push:
new 6344b4c fedora:38 Pull in changes from latest build_h3_tools (#187)
6344b4c is described below
commit 6344b4c7eb72648573fb86baef66f7752117361b
Author: Brian Neradt <[email protected]>
AuthorDate: Thu Jun 29 17:06:11 2023 -0500
fedora:38 Pull in changes from latest build_h3_tools (#187)
---
docker/fedora38/build_h3_tools.sh | 41 +++++++++++++++++++++++++--------------
1 file changed, 26 insertions(+), 15 deletions(-)
diff --git a/docker/fedora38/build_h3_tools.sh
b/docker/fedora38/build_h3_tools.sh
index f074466..2e96737 100644
--- a/docker/fedora38/build_h3_tools.sh
+++ b/docker/fedora38/build_h3_tools.sh
@@ -19,6 +19,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+set -e
# This is a slightly modified version of:
@@ -31,12 +32,12 @@
# versions of these over time.
#
# * It also doesn't run sudo since the Dockerfile will run this as root.
-
-
-set -e
+#
+# * It also doesn't use a mktemp since the caller sets up a temporary directory
+# that it later removes.
# Update this as the draft we support updates.
-OPENSSL_BRANCH=${OPENSSL_BRANCH:-"OpenSSL_1_1_1t+quic"}
+OPENSSL_BRANCH=${OPENSSL_BRANCH:-"OpenSSL_1_1_1u+quic"}
# Set these, if desired, to change these to your preferred installation
# directory
@@ -87,6 +88,9 @@ set -x
if [ `uname -s` = "Linux" ]
then
num_threads=$(nproc)
+elif [ `uname -s` = "FreeBSD" ]
+then
+ num_threads=$(sysctl -n hw.ncpu)
else
# MacOS.
num_threads=$(sysctl -n hw.logicalcpu)
@@ -106,6 +110,8 @@ fi
if [ `uname -s` = "Darwin" ]; then
OS="darwin"
+elif [ `uname -s` = "FreeBSD" ]; then
+ OS="freebsd"
else
OS="linux"
fi
@@ -132,7 +138,7 @@ cmake \
${MAKE} -j ${num_threads}
${MAKE} install
-cd ..
+cd ../..
# Build quiche
# Steps borrowed from:
https://github.com/apache/trafficserver-ci/blob/main/docker/rockylinux8/Dockerfile
@@ -154,10 +160,10 @@ cd ..
echo "Building OpenSSL with QUIC support"
[ ! -d openssl-quic ] && git clone -b ${OPENSSL_BRANCH} --depth 1
https://github.com/quictls/openssl.git openssl-quic
cd openssl-quic
-git checkout c3f5f36f5dadfa334119e940b7576a4abfa428c8
+git checkout 636c615c139061b125a25461708f4afc79284f83
./config enable-tls1_3 --prefix=${OPENSSL_PREFIX}
${MAKE} -j ${num_threads}
-${MAKE} -j install
+${MAKE} install_sw
# The symlink target provides a more convenient path for the user while also
# providing, in the symlink source, the precise branch of the OpenSSL build.
@@ -167,9 +173,8 @@ cd ..
# Then nghttp3
echo "Building nghttp3..."
if [ ! -d nghttp3 ]; then
- git clone https://github.com/ngtcp2/nghttp3.git
+ git clone --depth 1 -b v0.12.0 https://github.com/ngtcp2/nghttp3.git
cd nghttp3
- git checkout -b v0.9.0 v0.9.0
cd ..
fi
cd nghttp3
@@ -188,9 +193,8 @@ cd ..
# Now ngtcp2
echo "Building ngtcp2..."
if [ ! -d ngtcp2 ]; then
- git clone https://github.com/ngtcp2/ngtcp2.git
+ git clone --depth 1 -b v0.16.0 https://github.com/ngtcp2/ngtcp2.git
cd ngtcp2
- git checkout -b v0.13.1 v0.13.1
cd ..
fi
cd ngtcp2
@@ -211,18 +215,22 @@ echo "Building nghttp2 ..."
if [ ! -d nghttp2 ]; then
git clone https://github.com/tatsuhiro-t/nghttp2.git
cd nghttp2
- git checkout -b v1.52.0 v1.52.0
+ # The following has a fix for builds on systems, like Mac, which do not have
+ # libev. There isn't currently a release with this fix yet.
+ git checkout 2c955ab76b42dfce58e812da6bbe8a526a125fea
cd ..
fi
cd nghttp2
autoreconf -if
-if [ `uname -s` = "Darwin" ]
+if [ `uname -s` = "Darwin" ] || [ `uname -s` = "FreeBSD" ]
then
- # --enable-app requires systemd which is not available on Mac.
+ # --enable-app requires systemd which is not available on Mac/FreeBSD.
ENABLE_APP=""
else
ENABLE_APP="--enable-app"
fi
+
+# Note for FreeBSD: This will not build h2load. h2load can be run on a remote
machine.
./configure \
--prefix=${BASE} \
PKG_CONFIG_PATH=${BASE}/lib/pkgconfig:${OPENSSL_PREFIX}/lib/pkgconfig \
@@ -237,8 +245,11 @@ cd ..
# Then curl
echo "Building curl ..."
-[ ! -d curl ] && git clone --branch curl-7_88_1
https://github.com/curl/curl.git
+[ ! -d curl ] && git clone https://github.com/curl/curl.git
cd curl
+# There isn't currently a released curl yet which has the updates for the above
+# ngtcp2 and nghttp3 library versions.
+git checkout 891e25edb8527bb8de79cdca6d943216c230e905
# On mac autoreconf fails on the first attempt with an issue finding ltmain.sh.
# The second runs fine.
autoreconf -fi || autoreconf -fi
