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 674ebdb fedora:40 rockylinux:8 build_h3_tools_updates (#355)
674ebdb is described below
commit 674ebdb8962abb8a26f4b31e9102f0ffaf9322c5
Author: Brian Neradt <[email protected]>
AuthorDate: Mon Jul 15 18:22:44 2024 -0500
fedora:40 rockylinux:8 build_h3_tools_updates (#355)
build_h3_tools updates from master and:
https://github.com/apache/trafficserver/pull/11493
---
docker/fedora40/build_boringssl_h3_tools.sh | 11 ++++++++---
docker/fedora40/build_openssl_h3_tools.sh | 4 +++-
docker/rockylinux8/build_boringssl_h3_tools.sh | 11 ++++++++---
docker/rockylinux8/build_openssl_h3_tools.sh | 4 +++-
4 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/docker/fedora40/build_boringssl_h3_tools.sh
b/docker/fedora40/build_boringssl_h3_tools.sh
index e1b758b..68ace00 100755
--- a/docker/fedora40/build_boringssl_h3_tools.sh
+++ b/docker/fedora40/build_boringssl_h3_tools.sh
@@ -144,12 +144,15 @@ set -e
# Note: -Wdangling-pointer=0
# We may have some issues with latest GCC compilers, so disabling
-Wdangling-pointer=
+# Note: -UBORINGSSL_HAVE_LIBUNWIND
+# Disable related libunwind test builds, there are some version number issues
+# with this pkg in Ubuntu 20.04, so disable this to make sure it builds.
cmake \
-B build-shared \
-DGO_EXECUTABLE=${GO_BINARY_PATH} \
-DCMAKE_INSTALL_PREFIX=${BASE}/boringssl \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_CXX_FLAGS='-Wno-error=ignored-attributes' \
+ -DCMAKE_CXX_FLAGS='-Wno-error=ignored-attributes -UBORINGSSL_HAVE_LIBUNWIND'
\
-DCMAKE_C_FLAGS=${BSSL_C_FLAGS} \
-DBUILD_SHARED_LIBS=1
cmake \
@@ -157,7 +160,7 @@ cmake \
-DGO_EXECUTABLE=${GO_BINARY_PATH} \
-DCMAKE_INSTALL_PREFIX=${BASE}/boringssl \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_CXX_FLAGS='-Wno-error=ignored-attributes' \
+ -DCMAKE_CXX_FLAGS='-Wno-error=ignored-attributes -UBORINGSSL_HAVE_LIBUNWIND'
\
-DCMAKE_C_FLAGS=${BSSL_C_FLAGS} \
-DBUILD_SHARED_LIBS=0
cmake --build build-shared -j ${num_threads}
@@ -174,12 +177,14 @@ echo "Building quiche"
QUICHE_BASE="${BASE:-/opt}/quiche"
[ ! -d quiche ] && git clone https://github.com/cloudflare/quiche.git
cd quiche
-git checkout 0.21.0
+git checkout 0.22.0
QUICHE_BSSL_PATH=${BORINGSSL_LIB_PATH} QUICHE_BSSL_LINK_KIND=dylib cargo build
-j4 --package quiche --release --features ffi,pkg-config-meta,qlog
mkdir -p ${QUICHE_BASE}/lib/pkgconfig
mkdir -p ${QUICHE_BASE}/include
cp target/release/libquiche.a ${QUICHE_BASE}/lib/
[ -f target/release/libquiche.so ] && cp target/release/libquiche.so
${QUICHE_BASE}/lib/
+# Why a link?
https://github.com/cloudflare/quiche/issues/1808#issuecomment-2196233378
+ln -s ${QUICHE_BASE}/lib/libquiche.so ${QUICHE_BASE}/lib/libquiche.so.0
cp quiche/include/quiche.h ${QUICHE_BASE}/include/
cp target/release/quiche.pc ${QUICHE_BASE}/lib/pkgconfig
chmod -R a+rX ${BASE}
diff --git a/docker/fedora40/build_openssl_h3_tools.sh
b/docker/fedora40/build_openssl_h3_tools.sh
index beeadee..bde4bbc 100755
--- a/docker/fedora40/build_openssl_h3_tools.sh
+++ b/docker/fedora40/build_openssl_h3_tools.sh
@@ -127,7 +127,7 @@ echo "Building quiche"
QUICHE_BASE="${BASE:-/opt}/quiche"
[ ! -d quiche ] && git clone https://github.com/cloudflare/quiche.git
cd quiche
-git checkout 0.21.0
+git checkout 0.22.0
PKG_CONFIG_PATH="$OPENSSL_LIB"/pkgconfig LD_LIBRARY_PATH="$OPENSSL_LIB" \
cargo build -j4 --package quiche --release --features
ffi,pkg-config-meta,qlog,openssl
@@ -136,6 +136,8 @@ mkdir -p ${QUICHE_BASE}/lib/pkgconfig
mkdir -p ${QUICHE_BASE}/include
cp target/release/libquiche.a ${QUICHE_BASE}/lib/
[ -f target/release/libquiche.so ] && cp target/release/libquiche.so
${QUICHE_BASE}/lib/
+# Why a link?
https://github.com/cloudflare/quiche/issues/1808#issuecomment-2196233378
+ln -s ${QUICHE_BASE}/lib/libquiche.so ${QUICHE_BASE}/lib/libquiche.so.0
cp quiche/include/quiche.h ${QUICHE_BASE}/include/
cp target/release/quiche.pc ${QUICHE_BASE}/lib/pkgconfig
chmod -R a+rX ${BASE}
diff --git a/docker/rockylinux8/build_boringssl_h3_tools.sh
b/docker/rockylinux8/build_boringssl_h3_tools.sh
index e1b758b..68ace00 100755
--- a/docker/rockylinux8/build_boringssl_h3_tools.sh
+++ b/docker/rockylinux8/build_boringssl_h3_tools.sh
@@ -144,12 +144,15 @@ set -e
# Note: -Wdangling-pointer=0
# We may have some issues with latest GCC compilers, so disabling
-Wdangling-pointer=
+# Note: -UBORINGSSL_HAVE_LIBUNWIND
+# Disable related libunwind test builds, there are some version number issues
+# with this pkg in Ubuntu 20.04, so disable this to make sure it builds.
cmake \
-B build-shared \
-DGO_EXECUTABLE=${GO_BINARY_PATH} \
-DCMAKE_INSTALL_PREFIX=${BASE}/boringssl \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_CXX_FLAGS='-Wno-error=ignored-attributes' \
+ -DCMAKE_CXX_FLAGS='-Wno-error=ignored-attributes -UBORINGSSL_HAVE_LIBUNWIND'
\
-DCMAKE_C_FLAGS=${BSSL_C_FLAGS} \
-DBUILD_SHARED_LIBS=1
cmake \
@@ -157,7 +160,7 @@ cmake \
-DGO_EXECUTABLE=${GO_BINARY_PATH} \
-DCMAKE_INSTALL_PREFIX=${BASE}/boringssl \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_CXX_FLAGS='-Wno-error=ignored-attributes' \
+ -DCMAKE_CXX_FLAGS='-Wno-error=ignored-attributes -UBORINGSSL_HAVE_LIBUNWIND'
\
-DCMAKE_C_FLAGS=${BSSL_C_FLAGS} \
-DBUILD_SHARED_LIBS=0
cmake --build build-shared -j ${num_threads}
@@ -174,12 +177,14 @@ echo "Building quiche"
QUICHE_BASE="${BASE:-/opt}/quiche"
[ ! -d quiche ] && git clone https://github.com/cloudflare/quiche.git
cd quiche
-git checkout 0.21.0
+git checkout 0.22.0
QUICHE_BSSL_PATH=${BORINGSSL_LIB_PATH} QUICHE_BSSL_LINK_KIND=dylib cargo build
-j4 --package quiche --release --features ffi,pkg-config-meta,qlog
mkdir -p ${QUICHE_BASE}/lib/pkgconfig
mkdir -p ${QUICHE_BASE}/include
cp target/release/libquiche.a ${QUICHE_BASE}/lib/
[ -f target/release/libquiche.so ] && cp target/release/libquiche.so
${QUICHE_BASE}/lib/
+# Why a link?
https://github.com/cloudflare/quiche/issues/1808#issuecomment-2196233378
+ln -s ${QUICHE_BASE}/lib/libquiche.so ${QUICHE_BASE}/lib/libquiche.so.0
cp quiche/include/quiche.h ${QUICHE_BASE}/include/
cp target/release/quiche.pc ${QUICHE_BASE}/lib/pkgconfig
chmod -R a+rX ${BASE}
diff --git a/docker/rockylinux8/build_openssl_h3_tools.sh
b/docker/rockylinux8/build_openssl_h3_tools.sh
index beeadee..bde4bbc 100755
--- a/docker/rockylinux8/build_openssl_h3_tools.sh
+++ b/docker/rockylinux8/build_openssl_h3_tools.sh
@@ -127,7 +127,7 @@ echo "Building quiche"
QUICHE_BASE="${BASE:-/opt}/quiche"
[ ! -d quiche ] && git clone https://github.com/cloudflare/quiche.git
cd quiche
-git checkout 0.21.0
+git checkout 0.22.0
PKG_CONFIG_PATH="$OPENSSL_LIB"/pkgconfig LD_LIBRARY_PATH="$OPENSSL_LIB" \
cargo build -j4 --package quiche --release --features
ffi,pkg-config-meta,qlog,openssl
@@ -136,6 +136,8 @@ mkdir -p ${QUICHE_BASE}/lib/pkgconfig
mkdir -p ${QUICHE_BASE}/include
cp target/release/libquiche.a ${QUICHE_BASE}/lib/
[ -f target/release/libquiche.so ] && cp target/release/libquiche.so
${QUICHE_BASE}/lib/
+# Why a link?
https://github.com/cloudflare/quiche/issues/1808#issuecomment-2196233378
+ln -s ${QUICHE_BASE}/lib/libquiche.so ${QUICHE_BASE}/lib/libquiche.so.0
cp quiche/include/quiche.h ${QUICHE_BASE}/include/
cp target/release/quiche.pc ${QUICHE_BASE}/lib/pkgconfig
chmod -R a+rX ${BASE}
