diff options
author | fuzzard <fuzzard@kodi.tv> | 2023-05-14 12:23:52 +1000 |
---|---|---|
committer | fuzzard <fuzzard@kodi.tv> | 2023-05-14 12:23:52 +1000 |
commit | b61beb66385be5eb4ecd9bb8a981a06708903eaf (patch) | |
tree | 7e68818841d63fd955c6272861b811565b578e98 /tools | |
parent | 7d0690f7c66e33a1cd8ede1a4ffb73da54123b66 (diff) |
[tools/depends][target] remove meson_cross_setup
We moved the meson cross file setup to the configure script. Just remove the remnants
Diffstat (limited to 'tools')
-rw-r--r-- | tools/depends/target/Makefile | 32 | ||||
-rwxr-xr-x | tools/depends/target/meson-cross-setup.sh | 30 |
2 files changed, 5 insertions, 57 deletions
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile index 93f769ae5c..9a6e449c00 100644 --- a/tools/depends/target/Makefile +++ b/tools/depends/target/Makefile @@ -158,25 +158,22 @@ download: $(DOWNLOAD_TARGETS) crossguid: $(LIBUUID) curl: openssl nghttp2 -dav1d: meson-cross-file dbus: expat ffmpeg: $(ICONV) $(ZLIB) bzip2 gnutls dav1d $(LIBVA) -fontconfig: freetype2 expat $(ICONV) $(LIBUUID) meson-cross-file +fontconfig: freetype2 expat $(ICONV) $(LIBUUID) freetype2: bzip2 harfbuzz $(ZLIB) -fribidi: meson-cross-file gettext: $(ICONV) gnutls: nettle $(ZLIB) -harfbuzz: meson-cross-file freetype2-noharfbuzz $(ICONV) +harfbuzz: freetype2-noharfbuzz $(ICONV) libass: fontconfig fribidi harfbuzz libpng freetype2 expat $(ICONV) libbluray: fontconfig freetype2 $(ICONV) udfread libxml2 libcdio-gplv3: $(ICONV) libcdio: $(ICONV) libcec: p8-platform -libdisplay-info: meson-cross-file hwdata -libdrm: meson-cross-file +libdisplay-info: hwdata libevdev: libudev libgcrypt: libgpg-error -libinput: mtdev libevdev meson-cross-file +libinput: mtdev libevdev libmicrohttpd: gnutls libgcrypt libgpg-error libplist: $(ZLIB) libpng: $(ZLIB) @@ -185,10 +182,9 @@ libxml2: $(ZLIB) libxslt: libgcrypt libxml2 libzip: bzip2 gnutls $(ZLIB) mariadb: openssl $(ICONV) $(ZLIB) -mesa: libdrm meson-cross-file $(MESA_DEPS) +mesa: libdrm $(MESA_DEPS) nettle: gmp openssl: $(ZLIB) -pipewire: meson-cross-file python3: expat gettext libxml2 sqlite3 openssl libffi bzip2 xz $(ICONV) pythonmodule-pil: bzip2 $(PYMODULE_DEPS) $(ZLIB) libjpeg-turbo libpng freetype2 python3 pythonmodule-setuptools pythonmodule-pycryptodome: $(PYMODULE_DEPS) python3 pythonmodule-setuptools @@ -267,21 +263,3 @@ linux-system-gl-libs: [ -f $(PREFIX)/lib/pkgconfig/wayland-egl.pc ] || ln -sf $(HOST_LIB_PKGCONFIG)/wayland-egl.pc $(PREFIX)/lib/pkgconfig/wayland-egl.pc [ -f $(PREFIX)/lib/pkgconfig/gl.pc ] || ln -sf $(HOST_LIB_PKGCONFIG)/gl.pc $(PREFIX)/lib/pkgconfig/gl.pc [ -f $(PREFIX)/lib/pkgconfig/glu.pc ] || ln -sf $(HOST_LIB_PKGCONFIG)/glu.pc $(PREFIX)/lib/pkgconfig/glu.pc - -$(PREFIX)/share/cross-file.meson: - PREFIX="$(PREFIX)" \ - NATIVEPREFIX="$(NATIVEPREFIX)" \ - CC="$(CC)" \ - CXX="$(CXX)" \ - AR="$(AR)" \ - STRIP="$(STRIP)" \ - MESON_SYSTEM="$(MESON_SYSTEM)" \ - MESON_CPU="$(MESON_CPU)" \ - CPU="$(CPU)" \ - CFLAGS="$(CFLAGS)" \ - CXXFLAGS="$(CXXFLAGS)" \ - LDFLAGS="$(LDFLAGS)" \ - ./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 deleted file mode 100755 index ea76a28410..0000000000 --- a/tools/depends/target/meson-cross-setup.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -cat > $1 << EOF -[binaries] -$($NATIVEPREFIX/bin/python3 -c "print('c = {}'.format('$CC'.split()))") -$($NATIVEPREFIX/bin/python3 -c "print('cpp = {}'.format('$CXX'.split()))") -ar = '$AR' -strip = '$STRIP' -pkgconfig = '$NATIVEPREFIX/bin/pkg-config' - -[host_machine] -system = '$MESON_SYSTEM' -cpu_family = '$MESON_CPU' -cpu = '$CPU' -endian = 'little' - -[properties] -pkg_config_libdir = '$PREFIX/lib/pkgconfig' - -[built-in options] -$($NATIVEPREFIX/bin/python3 -c "print('c_args = {}'.format([x for x in '$CFLAGS'.split() if x not in ['-g', '-gdwarf-2']]))") -$($NATIVEPREFIX/bin/python3 -c "print('c_link_args = {}'.format([x for x in '$LDFLAGS'.split()]))") -$($NATIVEPREFIX/bin/python3 -c "print('cpp_args = {}'.format([x for x in '$CXXFLAGS'.split() if x not in ['-g', '-gdwarf-2']]))") -$($NATIVEPREFIX/bin/python3 -c "print('cpp_link_args = {}'.format([x for x in '$LDFLAGS'.split()]))") -default_library = 'static' -prefix = '$PREFIX' -libdir = 'lib' -bindir = 'bin' -includedir = 'include' -EOF |