Browse Source

meson build system: Update from 0.50.1 to 0.52.0

emacs-27
Fredrik Fornwall 5 years ago
parent
commit
00d930255e
  1. 2
      scripts/build/configure/termux_step_configure_meson.sh
  2. 4
      scripts/build/setup/termux_setup_meson.sh

2
scripts/build/configure/termux_step_configure_meson.sh

@ -1,6 +1,6 @@
termux_step_configure_meson() { termux_step_configure_meson() {
termux_setup_meson termux_setup_meson
CC=gcc CXX=g++ $TERMUX_MESON \ CC=gcc CXX=g++ CFLAGS= CXXFLAGS= CPPFLAGS= LDFLAGS= $TERMUX_MESON \
$TERMUX_PKG_SRCDIR \ $TERMUX_PKG_SRCDIR \
$TERMUX_PKG_BUILDDIR \ $TERMUX_PKG_BUILDDIR \
--cross-file $TERMUX_MESON_CROSSFILE \ --cross-file $TERMUX_MESON_CROSSFILE \

4
scripts/build/setup/termux_setup_meson.sh

@ -1,6 +1,6 @@
termux_setup_meson() { termux_setup_meson() {
termux_setup_ninja termux_setup_ninja
local MESON_VERSION=0.50.1 local MESON_VERSION=0.52.0
local MESON_FOLDER=$TERMUX_COMMON_CACHEDIR/meson-$MESON_VERSION-v1 local MESON_FOLDER=$TERMUX_COMMON_CACHEDIR/meson-$MESON_VERSION-v1
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
@ -9,7 +9,7 @@ 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" \
f68f56d60c80a77df8fc08fa1016bc5831605d4717b622c96212573271e14ecc d60f75f0dedcc4fd249dbc7519d6f3ce6df490033d276ef1cf27453ef4938d32
tar xf "$MESON_TAR_FILE" -C "$TERMUX_PKG_TMPDIR" tar xf "$MESON_TAR_FILE" -C "$TERMUX_PKG_TMPDIR"
# Avoid meson stripping away DT_RUNPATH, see # Avoid meson stripping away DT_RUNPATH, see
# (https://github.com/NetBSD/pkgsrc/commit/2fb2c013715a6374b4e2d1f8e9f2143e827f0f64 # (https://github.com/NetBSD/pkgsrc/commit/2fb2c013715a6374b4e2d1f8e9f2143e827f0f64

Loading…
Cancel
Save