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:
bc1f04a
)
Bump meson version used when building
author
Fredrik Fornwall
<fredrik@fornwall.net>
Sat, 14 Oct 2017 21:02:24 +0000
(23:02 +0200)
committer
Fredrik Fornwall
<fredrik@fornwall.net>
Sat, 14 Oct 2017 23:02:39 +0000
(
01:02
+0200)
build-package.sh
patch
|
blob
|
blame
|
history
diff --git
a/build-package.sh
b/build-package.sh
index 942a0847e530e47d4737b82c86fab54b4b86acb9..22ad1d090112776705bf59e53cb602ce6b86d152 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
2.1
+ local MESON_VERSION=0.4
3.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,12
+114,12
@@
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 \
- 30bdded6fefc48211d30818d96dd34aae56ee86ce9710476f501bd7695469c4b
+ c513eca90e0d70bf14cd1eaafea2fa91cf40a73326a7ff61f08a005048057340
tar xf "$MESON_TAR_FILE" -C "$TERMUX_COMMON_CACHEDIR"
(cd $MESON_FOLDER && patch -p1 < $TERMUX_SCRIPTDIR/scripts/meson-android.patch)
fi
TERMUX_MESON="$MESON_FOLDER/meson.py"
tar xf "$MESON_TAR_FILE" -C "$TERMUX_COMMON_CACHEDIR"
(cd $MESON_FOLDER && patch -p1 < $TERMUX_SCRIPTDIR/scripts/meson-android.patch)
fi
TERMUX_MESON="$MESON_FOLDER/meson.py"
- TERMUX_MESON_CROSSFILE=$TERMUX_COMMON_CACHEDIR/meson-crossfile-$TERMUX_ARCH-v
1
.txt
+ TERMUX_MESON_CROSSFILE=$TERMUX_COMMON_CACHEDIR/meson-crossfile-$TERMUX_ARCH-v
2
.txt
if [ ! -f $TERMUX_MESON_CROSSFILE ]; then
local MESON_CPU MESON_CPU_FAMILY
if [ $TERMUX_ARCH = "arm" ]; then
if [ ! -f $TERMUX_MESON_CROSSFILE ]; then
local MESON_CPU MESON_CPU_FAMILY
if [ $TERMUX_ARCH = "arm" ]; then
@@
-144,7
+144,7
@@
termux_setup_meson() {
c = '$CC'
cpp = '$CXX'
ld = '$LD'
c = '$CC'
cpp = '$CXX'
ld = '$LD'
- pkg
-
config = '$PKG_CONFIG'
+ pkgconfig = '$PKG_CONFIG'
strip = '$STRIP'
[properties]
needs_exe_wrapper = true
strip = '$STRIP'
[properties]
needs_exe_wrapper = true