aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorLukas Rusak <lorusak@gmail.com>2020-09-10 15:54:49 -0700
committerLukas Rusak <lorusak@gmail.com>2020-09-10 15:54:49 -0700
commit6ce03fab49bc70ffa1bd37e28ef262a446475c25 (patch)
treeb0724a9b8a32a5b40b33176d733b7e37d30eb0a0 /tools
parent8bd1a5b7dc42be0d6951c484afbd46872083b34b (diff)
tools/depends: meson-cross-file: generate only once
Diffstat (limited to 'tools')
-rw-r--r--tools/depends/target/Makefile8
-rwxr-xr-xtools/depends/target/meson-cross-setup.sh2
2 files changed, 6 insertions, 4 deletions
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
index afda288e3b..6f6d32f2d6 100644
--- a/tools/depends/target/Makefile
+++ b/tools/depends/target/Makefile
@@ -12,7 +12,7 @@ DEPENDS = \
libxml2 rapidjson libmicrohttpd mariadb libffi \
python3 libshairplay libfmt libspdlog \
libplist libcec libbluray tinyxml \
- taglib libusb libnfs meson-cross-file \
+ taglib libusb libnfs \
pythonmodule-pil pythonmodule-pycryptodome pythonmodule-setuptools \
libxslt ffmpeg crossguid libudfread \
libdvdread libdvdnav libdvdcss p8-platform flatbuffers dav1d
@@ -191,7 +191,7 @@ linux-system-libs: linux-system-libs-egl
[ -f $(PREFIX)/lib/pkgconfig/xkbcommon.pc ] || ln -sf /usr/lib/$(HOST)/pkgconfig/xkbcommon.pc $(PREFIX)/lib/pkgconfig/xkbcommon.pc
[ -f $(PREFIX)/lib/pkgconfig/libva.pc ] || ln -sf /usr/lib/$(HOST)/pkgconfig/libva.pc $(PREFIX)/lib/pkgconfig/libva.pc
-meson-cross-file:
+$(PREFIX)/share/cross-file.meson:
PREFIX="$(PREFIX)" \
NATIVEPREFIX="$(NATIVEPREFIX)" \
CC="$(CC)" \
@@ -204,5 +204,7 @@ meson-cross-file:
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)" \
LDFLAGS="$(LDFLAGS)" \
- ./meson-cross-setup.sh
+ ./meson-cross-setup.sh $@
+.PHONY: meson-cross-file
+meson-cross-file: $(PREFIX)/share/cross-file.meson
diff --git a/tools/depends/target/meson-cross-setup.sh b/tools/depends/target/meson-cross-setup.sh
index c0c166410c..9b5546200f 100755
--- a/tools/depends/target/meson-cross-setup.sh
+++ b/tools/depends/target/meson-cross-setup.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-cat > $PREFIX/share/cross-file.meson << EOF
+cat > $1 << EOF
[binaries]
$($NATIVEPREFIX/bin/python3 -c "print('c = {}'.format('$CC'.split()))")
$($NATIVEPREFIX/bin/python3 -c "print('cpp = {}'.format('$CXX'.split()))")