X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/1b3f3ebde9f9203b770be363e99899984b35493d..71d210653b5b0503916c9951c6f528649192011c:/build-package.sh

diff --git a/build-package.sh b/build-package.sh
index 2f3e433f..3f411e67 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -160,7 +160,7 @@ termux_setup_meson() {
 # Utility function for cmake-built packages to setup a current cmake.
 termux_setup_cmake() {
 	local TERMUX_CMAKE_MAJORVESION=3.9
-	local TERMUX_CMAKE_MINORVERSION=2
+	local TERMUX_CMAKE_MINORVERSION=4
 	local TERMUX_CMAKE_VERSION=$TERMUX_CMAKE_MAJORVESION.$TERMUX_CMAKE_MINORVERSION
 	local TERMUX_CMAKE_TARNAME=cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64.tar.gz
 	local TERMUX_CMAKE_TARFILE=$TERMUX_PKG_TMPDIR/$TERMUX_CMAKE_TARNAME
@@ -168,7 +168,7 @@ termux_setup_cmake() {
 	if [ ! -d "$TERMUX_CMAKE_FOLDER" ]; then
 		termux_download https://cmake.org/files/v$TERMUX_CMAKE_MAJORVESION/$TERMUX_CMAKE_TARNAME \
 		                "$TERMUX_CMAKE_TARFILE" \
-				f4e1e848e21c3fba134fbddd793860ba9a17c35d0aeaa3bd83149a6ec1bf9fbb
+		                6d8573377fc7fca86ed1952b76f62880e2159a3de6508761dd0d619a8e96551b
 		rm -Rf "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64"
 		tar xf "$TERMUX_CMAKE_TARFILE" -C "$TERMUX_PKG_TMPDIR"
 		mv "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" \
@@ -475,7 +475,7 @@ termux_step_extract_package() {
 		rm -Rf $folder
 		unzip -q "$file"
 	else
-		folder=`tar tf "$file" | head -1 | sed -e 's/\/.*//'`
+		folder=`tar tf "$file" | head -1 | sed 's/^.\///' | sed -e 's/\/.*//'`
 		rm -Rf $folder
 		tar xf "$file"
 	fi