jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

build-style/meson: use do_patch to create crossfile

Browse source
This commit is contained in:
maxice8 2019-02-26 11:56:47 -03:00 committed by maxice8
parent fed29c5379
commit 237da231cb
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
common/build-style/meson.sh
View file

@ -1,9 +1,7 @@
#
# This helper is for templates using meson.
#
do_configure() {
: ${meson_cmd:=meson}
: ${meson_builddir:=build}
do_patch() {
: ${meson_crossfile:=xbps_meson.cross}
if [ "$CROSS_BUILD" ]; then
@ -71,6 +69,16 @@ cpu_family = '${_MESON_CPU_FAMILY}'
cpu = '${_MESON_TARGET_CPU}'
endian = '${_MESON_TARGET_ENDIAN}'
EOF
unset _MESON_CPU_FAMILY _MESON_TARGET_CPU _MESON_TARGET_ENDIAN
fi
}
do_configure() {
: ${meson_cmd:=meson}
: ${meson_builddir:=build}
if [ "$CROSS_BUILD" ]; then
configure_args+=" --cross-file=${meson_crossfile}"
# Meson tries to compile natively with CC, CXX, LD, AR
@ -88,8 +96,6 @@ EOF
# is set, so set the PKG_CONFIG variable to tell Meson which pkg-config
# it should use when searching for stuff in the build machine
export PKG_CONFIG="/usr/bin/pkg-config"
unset _MESON_CPU_FAMILY _MESON_TARGET_CPU _MESON_TARGET_ENDIAN
fi
# The binutils ar cannot perform LTO on static libraries so we have to use