~mdw
/
termux-packages
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add libicu to harfbuzz build dependencies (#1445)
[termux-packages]
/
build-package.sh
diff --git
a/build-package.sh
b/build-package.sh
index
b009c45
..
964955a
100755
(executable)
--- a/
build-package.sh
+++ b/
build-package.sh
@@
-90,14
+90,14
@@
termux_setup_golang() {
# Utility function for cmake-built packages to setup a current ninja.
termux_setup_ninja() {
# Utility function for cmake-built packages to setup a current ninja.
termux_setup_ninja() {
- local NINJA_VERSION=1.
7
.2
+ local NINJA_VERSION=1.
8
.2
local NINJA_FOLDER=$TERMUX_COMMON_CACHEDIR/ninja-$NINJA_VERSION
if [ ! -x $NINJA_FOLDER/ninja ]; then
mkdir -p $NINJA_FOLDER
local NINJA_ZIP_FILE=$TERMUX_PKG_TMPDIR/ninja-$NINJA_VERSION.zip
termux_download https://github.com/ninja-build/ninja/releases/download/v$NINJA_VERSION/ninja-linux.zip \
$NINJA_ZIP_FILE \
local NINJA_FOLDER=$TERMUX_COMMON_CACHEDIR/ninja-$NINJA_VERSION
if [ ! -x $NINJA_FOLDER/ninja ]; then
mkdir -p $NINJA_FOLDER
local NINJA_ZIP_FILE=$TERMUX_PKG_TMPDIR/ninja-$NINJA_VERSION.zip
termux_download https://github.com/ninja-build/ninja/releases/download/v$NINJA_VERSION/ninja-linux.zip \
$NINJA_ZIP_FILE \
- 38fa8cfb9c1632a5cdf7a32fe1a7c5aa89e96c1d492c28624f4cc018e68458b9
+ d2fea9ff33b3ef353161ed906f260d565ca55b8ca0568fa07b1d2cab90a84a07
unzip $NINJA_ZIP_FILE -d $NINJA_FOLDER
fi
export PATH=$NINJA_FOLDER:$PATH
unzip $NINJA_ZIP_FILE -d $NINJA_FOLDER
fi
export PATH=$NINJA_FOLDER:$PATH
@@
-106,7
+106,7
@@
termux_setup_ninja() {
# Utility function for cmake-built packages to setup a current meson.
termux_setup_meson() {
termux_setup_ninja
# Utility function for cmake-built packages to setup a current meson.
termux_setup_meson() {
termux_setup_ninja
- local MESON_VERSION=0.42.
0
+ local MESON_VERSION=0.42.
1
local MESON_FOLDER=$TERMUX_COMMON_CACHEDIR/meson-$MESON_VERSION
if [ ! -d "$MESON_FOLDER" ]; then
local MESON_TAR_NAME=meson-$MESON_VERSION.tar.gz
local MESON_FOLDER=$TERMUX_COMMON_CACHEDIR/meson-$MESON_VERSION
if [ ! -d "$MESON_FOLDER" ]; then
local MESON_TAR_NAME=meson-$MESON_VERSION.tar.gz
@@
-114,7
+114,7
@@
termux_setup_meson() {
termux_download \
https://github.com/mesonbuild/meson/releases/download/$MESON_VERSION/meson-$MESON_VERSION.tar.gz \
$MESON_TAR_FILE \
termux_download \
https://github.com/mesonbuild/meson/releases/download/$MESON_VERSION/meson-$MESON_VERSION.tar.gz \
$MESON_TAR_FILE \
- a74c7387a3dd8171e931bcd948355f7f9529368eae72c3c22a9beef6c2e73498
+ 30bdded6fefc48211d30818d96dd34aae56ee86ce9710476f501bd7695469c4b
tar xf "$MESON_TAR_FILE" -C "$TERMUX_COMMON_CACHEDIR"
(cd $MESON_FOLDER && patch -p1 < $TERMUX_SCRIPTDIR/scripts/meson-android.patch)
fi
tar xf "$MESON_TAR_FILE" -C "$TERMUX_COMMON_CACHEDIR"
(cd $MESON_FOLDER && patch -p1 < $TERMUX_SCRIPTDIR/scripts/meson-android.patch)
fi
@@
-309,7
+309,6
@@
termux_step_setup_variables() {
TERMUX_PKG_BUILD_DEPENDS=""
TERMUX_PKG_HOMEPAGE=""
TERMUX_PKG_DESCRIPTION="FIXME:Add description"
TERMUX_PKG_BUILD_DEPENDS=""
TERMUX_PKG_HOMEPAGE=""
TERMUX_PKG_DESCRIPTION="FIXME:Add description"
- TERMUX_PKG_FOLDERNAME=""
TERMUX_PKG_KEEP_STATIC_LIBRARIES="false"
TERMUX_PKG_ESSENTIAL=""
TERMUX_PKG_CONFLICTS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-conflicts
TERMUX_PKG_KEEP_STATIC_LIBRARIES="false"
TERMUX_PKG_ESSENTIAL=""
TERMUX_PKG_CONFLICTS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-conflicts
@@
-469,18
+468,18
@@
termux_step_extract_package() {
local file="$TERMUX_PKG_CACHEDIR/$filename"
termux_download "$TERMUX_PKG_SRCURL" "$file" "$TERMUX_PKG_SHA256"
local file="$TERMUX_PKG_CACHEDIR/$filename"
termux_download "$TERMUX_PKG_SRCURL" "$file" "$TERMUX_PKG_SHA256"
- if [ "x$TERMUX_PKG_FOLDERNAME" = "x" ]; then
- folder="${filename%%.t*}" && folder="${folder%%.zip}"
- folder="${folder/_/-}" # dpkg uses _ in tar filename, but - in folder
- else
- folder=$TERMUX_PKG_FOLDERNAME
- fi
- rm -Rf $folder
+ local folder
+ set +o pipefail
if [ "${file##*.}" = zip ]; then
if [ "${file##*.}" = zip ]; then
+ folder=`unzip -qql "$file" | head -n1 | tr -s ' ' | cut -d' ' -f5-`
+ rm -Rf $folder
unzip -q "$file"
else
unzip -q "$file"
else
+ folder=`tar tf "$file" | head -1 | sed 's/^.\///' | sed -e 's/\/.*//'`
+ rm -Rf $folder
tar xf "$file"
fi
tar xf "$file"
fi
+ set -o pipefail
mv $folder "$TERMUX_PKG_SRCDIR"
}
mv $folder "$TERMUX_PKG_SRCDIR"
}