chiark
/
gitweb
/
~mdw
/
termux-packages
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5e5e5fa
)
Update meson version used from 0.41.2 to 0.42.0
author
Fredrik Fornwall
<fredrik@fornwall.net>
Thu, 17 Aug 2017 09:44:08 +0000
(11:44 +0200)
committer
Fredrik Fornwall
<fredrik@fornwall.net>
Thu, 17 Aug 2017 09:44:08 +0000
(11:44 +0200)
build-package.sh
patch
|
blob
|
blame
|
history
diff --git
a/build-package.sh
b/build-package.sh
index f4fa40d447069152f1d382550b44243ebf25d459..6d9ada3f383e44b5cc6e004cfaafc9a6cb838f8a 100755
(executable)
--- a/
build-package.sh
+++ b/
build-package.sh
@@
-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.4
1.2
+ local MESON_VERSION=0.4
2.0
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 \
- 074dd24fd068be0893e2e45bcc35c919d8e12777e9d6a7efdf72d4dc300867ca
+ a74c7387a3dd8171e931bcd948355f7f9529368eae72c3c22a9beef6c2e73498
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