diff --git a/alibuild-recipe-tools.sh b/alibuild-recipe-tools.sh index f715615833..f0471ce2b4 100644 --- a/alibuild-recipe-tools.sh +++ b/alibuild-recipe-tools.sh @@ -1,11 +1,11 @@ package: alibuild-recipe-tools -version: "v0.3.0" -tag: "v0.3.0" +version: "v0.4.0" +tag: "v0.4.0" license: GPL-3.0 source: https://github.com/alisw/alibuild-recipe-tools --- mkdir -p $INSTALLROOT/bin -install $SOURCEDIR/alibuild-generate-module $INSTALLROOT/bin +install $SOURCEDIR/alibuild-generate-module $SOURCEDIR/alibuild-generate-cmake-config $INSTALLROOT/bin MODULEDIR="$INSTALLROOT/etc/modulefiles" MODULEFILE="$MODULEDIR/$PKGNAME" diff --git a/freetype.sh b/freetype.sh index 45d8f7aad2..8a223092c5 100644 --- a/freetype.sh +++ b/freetype.sh @@ -1,6 +1,6 @@ package: FreeType -version: v2.10.1 -tag: VER-2-10-1 +version: v2.13.3 +tag: VER-2-13-3 source: https://github.com/freetype/freetype requires: - zlib @@ -20,6 +20,9 @@ type glibtoolize && export LIBTOOLIZE=glibtoolize sh autogen.sh ./configure --prefix="$INSTALLROOT" \ --with-png=no \ + --with-harfbuzz=no \ + --with-brotli=no \ + --with-bzip2=no \ ${ZLIB_ROOT:+--with-zlib="$ZLIB_ROOT"} make ${JOBS:+-j$JOBS} diff --git a/onnx.sh b/onnx.sh index 09cfeffe82..014b8f94ba 100644 --- a/onnx.sh +++ b/onnx.sh @@ -7,6 +7,7 @@ requires: - "GCC-Toolchain:(?!osx)" - protobuf - abseil + - zlib build_requires: - CMake - alibuild-recipe-tools diff --git a/onnxruntime.sh b/onnxruntime.sh index 71ceffd222..e5efdb70ce 100644 --- a/onnxruntime.sh +++ b/onnxruntime.sh @@ -1,6 +1,6 @@ package: ONNXRuntime version: "%(tag_basename)s" -tag: v1.22.0 +tag: v1.24.4 license: MIT source: https://github.com/microsoft/onnxruntime requires: diff --git a/zlib.sh b/zlib.sh index b58c549cea..19ce89ec48 100644 --- a/zlib.sh +++ b/zlib.sh @@ -16,6 +16,12 @@ rsync -a --chmod=ug=rwX --delete --exclude '**/.git' --delete-excluded $SOURCEDI make ${JOBS+-j $JOBS} make install + +# Upstream ships no CMake package config, so config-mode find_package(ZLIB) walks +# past us to the system one -- which on EL10 (zlib-ng-compat-devel) references a +# libz.a that only ships in CRB, and errors out when it is absent. +alibuild-generate-cmake-config --name ZLIB --lib z --static-target ZLIB::zlibstatic + # Modulefile MODULEDIR="$INSTALLROOT/etc/modulefiles" MODULEFILE="$MODULEDIR/$PKGNAME"