sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump meson version used when building

Browse Source
This commit is contained in:
Fredrik Fornwall 2017-10-14 23:02:24 +02:00
parent 1a209e947a
commit 88b46b6432
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build-package.sh
View File

@ -106,7 +106,7 @@ termux_setup_ninja() {
# Utility function for cmake-built packages to setup a current meson. # Utility function for cmake-built packages to setup a current meson.
termux_setup_meson() { termux_setup_meson() {
termux_setup_ninja termux_setup_ninja
local MESON_VERSION=0.42.1 local MESON_VERSION=0.43.0
local MESON_FOLDER=$TERMUX_COMMON_CACHEDIR/meson-$MESON_VERSION local MESON_FOLDER=$TERMUX_COMMON_CACHEDIR/meson-$MESON_VERSION
if [ ! -d "$MESON_FOLDER" ]; then if [ ! -d "$MESON_FOLDER" ]; then
local MESON_TAR_NAME=meson-$MESON_VERSION.tar.gz local MESON_TAR_NAME=meson-$MESON_VERSION.tar.gz
@ -114,12 +114,12 @@ termux_setup_meson() {
termux_download \ termux_download \
https://github.com/mesonbuild/meson/releases/download/$MESON_VERSION/meson-$MESON_VERSION.tar.gz \ https://github.com/mesonbuild/meson/releases/download/$MESON_VERSION/meson-$MESON_VERSION.tar.gz \
$MESON_TAR_FILE \ $MESON_TAR_FILE \
30bdded6fefc48211d30818d96dd34aae56ee86ce9710476f501bd7695469c4b c513eca90e0d70bf14cd1eaafea2fa91cf40a73326a7ff61f08a005048057340
tar xf "$MESON_TAR_FILE" -C "$TERMUX_COMMON_CACHEDIR" tar xf "$MESON_TAR_FILE" -C "$TERMUX_COMMON_CACHEDIR"
(cd $MESON_FOLDER && patch -p1 < $TERMUX_SCRIPTDIR/scripts/meson-android.patch) (cd $MESON_FOLDER && patch -p1 < $TERMUX_SCRIPTDIR/scripts/meson-android.patch)
fi fi
TERMUX_MESON="$MESON_FOLDER/meson.py" TERMUX_MESON="$MESON_FOLDER/meson.py"
TERMUX_MESON_CROSSFILE=$TERMUX_COMMON_CACHEDIR/meson-crossfile-$TERMUX_ARCH-v1.txt TERMUX_MESON_CROSSFILE=$TERMUX_COMMON_CACHEDIR/meson-crossfile-$TERMUX_ARCH-v2.txt
if [ ! -f $TERMUX_MESON_CROSSFILE ]; then if [ ! -f $TERMUX_MESON_CROSSFILE ]; then
local MESON_CPU MESON_CPU_FAMILY local MESON_CPU MESON_CPU_FAMILY
if [ $TERMUX_ARCH = "arm" ]; then if [ $TERMUX_ARCH = "arm" ]; then
@ -144,7 +144,7 @@ termux_setup_meson() {
c = '$CC' c = '$CC'
cpp = '$CXX' cpp = '$CXX'
ld = '$LD' ld = '$LD'
pkg-config = '$PKG_CONFIG' pkgconfig = '$PKG_CONFIG'
strip = '$STRIP' strip = '$STRIP'
[properties] [properties]
needs_exe_wrapper = true needs_exe_wrapper = true