diff options
44 files changed, 50 insertions, 92 deletions
diff --git a/devel/pkgconf/Makefile b/devel/pkgconf/Makefile index 1a9e12c80..240f04230 100644 --- a/devel/pkgconf/Makefile +++ b/devel/pkgconf/Makefile @@ -18,10 +18,9 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=meson/host include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/libpkgconf SECTION:=libs diff --git a/libs/freetype/Makefile b/libs/freetype/Makefile index 1ff9d3dcb..7dc7daa65 100644 --- a/libs/freetype/Makefile +++ b/libs/freetype/Makefile @@ -20,10 +20,8 @@ PKG_LICENSE:=FTL GPL-2.0-only MIT ZLIB GPL-3.0-or-later PKG_LICENSE_FILES:=docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT src/bdf/README src/pcf/README src/gzip/zlib.h builds/unix/config.sub builds/unix/config.guess builds/unix/libtool PKG_CPE_ID:=cpe:/a:freetype:freetype2 -PKG_BUILD_DEPENDS:=meson/host - include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/libfreetype SECTION:=libs diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index bef2c481b..9e5eec34a 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -22,15 +22,15 @@ PKG_CPE_ID:=cpe:/a:gnome:glib PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION) HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/glib-$(PKG_VERSION) -PKG_BUILD_DEPENDS:=meson/host gettext-full libiconv/host -HOST_BUILD_DEPENDS:=meson/host gettext-full/host libiconv/host libffi/host +PKG_BUILD_DEPENDS:=gettext-full libiconv/host +HOST_BUILD_DEPENDS:=gettext-full/host libiconv/host libffi/host PKG_CONFIG_DEPENDS:=CONFIG_BUILD_NLS PKG_INSTALL:=1 include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/glib2 SECTION:=libs diff --git a/libs/jose/Makefile b/libs/jose/Makefile index d6d602195..1be469718 100644 --- a/libs/jose/Makefile +++ b/libs/jose/Makefile @@ -19,10 +19,8 @@ PKG_MAINTAINER:=Tibor Dudlák <tibor.dudlak@gmail.com> PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=COPYING -PKG_BUILD_DEPENDS:=meson/host - include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/libjose SECTION:=libs diff --git a/libs/json-glib/Makefile b/libs/json-glib/Makefile index c865808df..a94e5705d 100644 --- a/libs/json-glib/Makefile +++ b/libs/json-glib/Makefile @@ -21,13 +21,13 @@ PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net> -PKG_BUILD_DEPENDS:=glib2/host meson/host +PKG_BUILD_DEPENDS:=glib2/host OPENWRT_VERBOSE:=c include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/json-glib SECTION:=libs diff --git a/libs/jsoncpp/Makefile b/libs/jsoncpp/Makefile index 94d31a86d..ee9b39362 100644 --- a/libs/jsoncpp/Makefile +++ b/libs/jsoncpp/Makefile @@ -19,13 +19,8 @@ PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com> PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE -PKG_BUILD_DEPENDS:=meson/host - include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk - -HOSTCC=$(HOSTCC_NOCACHE) -HOSTCXX=$(HOSTCXX_NOCACHE) +include $(INCLUDE_DIR)/meson.mk define Package/jsoncpp SECTION:=libs diff --git a/libs/libdrm/Makefile b/libs/libdrm/Makefile index 206748878..444d64ad6 100644 --- a/libs/libdrm/Makefile +++ b/libs/libdrm/Makefile @@ -22,10 +22,9 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_LIBDRM_RADEON PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=meson/host include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/libdrm SECTION:=libs diff --git a/libs/libesmtp/Makefile b/libs/libesmtp/Makefile index 50c66840c..5f7d7a979 100644 --- a/libs/libesmtp/Makefile +++ b/libs/libesmtp/Makefile @@ -20,10 +20,8 @@ PKG_SOURCE_URL:=https://codeload.github.com/libesmtp/libESMTP/tar.gz/v$(PKG_VERS PKG_HASH:=32bc3614ca12d21c7d933f32d43410e8744b6f91fdca7732da9877a385e4e6c3 PKG_BUILD_DIR:=$(BUILD_DIR)/libESMTP-$(PKG_VERSION) -PKG_BUILD_DEPENDS:=meson/host - include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/libesmtp SECTION:=libs diff --git a/libs/libevdev/Makefile b/libs/libevdev/Makefile index 31b921370..f2858c557 100644 --- a/libs/libevdev/Makefile +++ b/libs/libevdev/Makefile @@ -17,10 +17,9 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=meson/host include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/libevdev SECTION:=libs diff --git a/libs/libinput/Makefile b/libs/libinput/Makefile index 5ee4c7053..1d174fb43 100644 --- a/libs/libinput/Makefile +++ b/libs/libinput/Makefile @@ -17,10 +17,9 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=meson/host include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/libinput SECTION:=libs diff --git a/libs/liblz4/Makefile b/libs/liblz4/Makefile index 45ec53911..96723e711 100644 --- a/libs/liblz4/Makefile +++ b/libs/liblz4/Makefile @@ -19,11 +19,10 @@ PKG_MAINTAINER:=Darik Horn <dajhorn@vanadac.com> PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 -PKG_BUILD_DEPENDS:=meson/host PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_lz4 include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk MESON_BUILD_DIR:=$(PKG_BUILD_DIR)/contrib/meson/openwrt-build diff --git a/libs/libmpdclient/Makefile b/libs/libmpdclient/Makefile index 6271ba447..91f445e6c 100644 --- a/libs/libmpdclient/Makefile +++ b/libs/libmpdclient/Makefile @@ -17,11 +17,10 @@ PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net> PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=COPYING -PKG_BUILD_DEPENDS:=meson/host PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/libmpdclient TITLE:=libmpdclient diff --git a/libs/libpsl/Makefile b/libs/libpsl/Makefile index ffd6758e9..c9a047d8b 100644 --- a/libs/libpsl/Makefile +++ b/libs/libpsl/Makefile @@ -18,11 +18,10 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=meson/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/libpsl SECTION:=libs diff --git a/libs/libsoup/Makefile b/libs/libsoup/Makefile index 9eae2fba2..4a7fd18b0 100644 --- a/libs/libsoup/Makefile +++ b/libs/libsoup/Makefile @@ -18,12 +18,12 @@ PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:gnome:libsoup -PKG_BUILD_DEPENDS:=meson/host glib2/host +PKG_BUILD_DEPENDS:=glib2/host PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/libsoup SECTION:=libs diff --git a/libs/nlohmannjson/Makefile b/libs/nlohmannjson/Makefile index bb2d210a4..004616d29 100644 --- a/libs/nlohmannjson/Makefile +++ b/libs/nlohmannjson/Makefile @@ -18,10 +18,9 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE.MIT PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=meson/host include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/nlohmannjson SECTION:=libs diff --git a/libs/p11-kit/Makefile b/libs/p11-kit/Makefile index bf5724144..41f6e8f67 100644 --- a/libs/p11-kit/Makefile +++ b/libs/p11-kit/Makefile @@ -20,10 +20,9 @@ PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=COPYING PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=meson/host include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/p11-kit SECTION:=libs diff --git a/libs/pixman/Makefile b/libs/pixman/Makefile index 97e8b7d96..66f404fb5 100644 --- a/libs/pixman/Makefile +++ b/libs/pixman/Makefile @@ -19,13 +19,10 @@ PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com> PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING -PKG_FIXUP:=autoreconf PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=meson/host include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk - +include $(INCLUDE_DIR)/meson.mk define Package/pixman SECTION:=libs diff --git a/libs/spice-protocol/Makefile b/libs/spice-protocol/Makefile index 94fcebe72..a6cebc025 100644 --- a/libs/spice-protocol/Makefile +++ b/libs/spice-protocol/Makefile @@ -18,11 +18,9 @@ PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com> PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=meson/host include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk - +include $(INCLUDE_DIR)/meson.mk define Package/spice-protocol SECTION:=libs diff --git a/libs/spice/Makefile b/libs/spice/Makefile index e386e1e03..46640116e 100644 --- a/libs/spice/Makefile +++ b/libs/spice/Makefile @@ -24,7 +24,7 @@ PKG_BUILD_DEPENDS:=spice-protocol include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/libspice-server SECTION:=libs diff --git a/multimedia/grilo-plugins/Makefile b/multimedia/grilo-plugins/Makefile index 3a769afb8..268e01da4 100644 --- a/multimedia/grilo-plugins/Makefile +++ b/multimedia/grilo-plugins/Makefile @@ -18,11 +18,10 @@ PKG_SOURCE_URL:=@GNOME/grilo-plugins/0.3/ PKG_HASH:=1c4305d67364a930543836cc1982f30e946973b8ff6af3efe31d87709ab520f8 PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=meson/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/grilo-plugins/Default SECTION:=multimedia diff --git a/multimedia/grilo/Makefile b/multimedia/grilo/Makefile index 3332dd5e9..4fab78435 100644 --- a/multimedia/grilo/Makefile +++ b/multimedia/grilo/Makefile @@ -22,7 +22,7 @@ PKG_BUILD_DEPENDS:=vala/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/grilo SECTION:=multimedia diff --git a/multimedia/gst1-libav/Makefile b/multimedia/gst1-libav/Makefile index 419026d95..116f0a9a0 100644 --- a/multimedia/gst1-libav/Makefile +++ b/multimedia/gst1-libav/Makefile @@ -108,7 +108,7 @@ PKG_CONFIG_DEPENDS:= \ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/gst1-libav SECTION:=multimedia diff --git a/multimedia/gst1-plugins-bad/Makefile b/multimedia/gst1-plugins-bad/Makefile index 27efc41c3..e199213f1 100644 --- a/multimedia/gst1-plugins-bad/Makefile +++ b/multimedia/gst1-plugins-bad/Makefile @@ -25,7 +25,7 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk GST_BAD_LIBS:= GST_BAD_MODULES:= diff --git a/multimedia/gst1-plugins-base/Makefile b/multimedia/gst1-plugins-base/Makefile index 3954576a6..c8ac5cac9 100644 --- a/multimedia/gst1-plugins-base/Makefile +++ b/multimedia/gst1-plugins-base/Makefile @@ -26,7 +26,7 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_gst1-mod-alsa \ diff --git a/multimedia/gst1-plugins-good/Makefile b/multimedia/gst1-plugins-good/Makefile index 5ee5e52c8..d9fea5c21 100644 --- a/multimedia/gst1-plugins-good/Makefile +++ b/multimedia/gst1-plugins-good/Makefile @@ -26,7 +26,7 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_gst1-mod-lame \ diff --git a/multimedia/gst1-plugins-ugly/Makefile b/multimedia/gst1-plugins-ugly/Makefile index c32dec870..28973bf18 100644 --- a/multimedia/gst1-plugins-ugly/Makefile +++ b/multimedia/gst1-plugins-ugly/Makefile @@ -25,7 +25,7 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_gst1-mod-asf \ diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile index 4439e3e81..f597f2a5a 100644 --- a/multimedia/gstreamer1/Makefile +++ b/multimedia/gstreamer1/Makefile @@ -23,11 +23,11 @@ PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:gstreamer_project:gstreamer PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=meson/host glib2/host gettext-full/host +PKG_BUILD_DEPENDS:=glib2/host gettext-full/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/gstreamer1/Default CATEGORY:=Multimedia diff --git a/net/fastd/Makefile b/net/fastd/Makefile index 9175227a5..fee7795d3 100644 --- a/net/fastd/Makefile +++ b/net/fastd/Makefile @@ -43,11 +43,10 @@ PKG_CONFIG_DEPENDS:=\ CONFIG_FASTD_WITH_OFFLOAD_L2TP -PKG_BUILD_DEPENDS:=meson/host nacl -PKG_BUILD_PARALLEL:=1 +PKG_BUILD_DEPENDS:=nacl include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/fastd SECTION:=net diff --git a/net/fastd/patches/0001-config-allow-disabling-L2TP-offload-when-fastd-doesn.patch b/net/fastd/patches/0001-config-allow-disabling-L2TP-offload-when-fastd-doesn.patch index f2eabc95d..a022bad39 100644 --- a/net/fastd/patches/0001-config-allow-disabling-L2TP-offload-when-fastd-doesn.patch +++ b/net/fastd/patches/0001-config-allow-disabling-L2TP-offload-when-fastd-doesn.patch @@ -11,8 +11,6 @@ is not supported. src/config.y | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -diff --git a/src/config.y b/src/config.y -index a107d7b9fda7..7a3ec6a32649 100644 --- a/src/config.y +++ b/src/config.y @@ -282,12 +282,14 @@ offload: TOK_L2TP boolean { @@ -33,6 +31,3 @@ index a107d7b9fda7..7a3ec6a32649 100644 #endif } ; --- -2.32.0 - diff --git a/net/iputils/Makefile b/net/iputils/Makefile index b702dd61a..4b145006f 100644 --- a/net/iputils/Makefile +++ b/net/iputils/Makefile @@ -23,10 +23,9 @@ PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:iputils_project:iputils PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=meson/host include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk MESON_ARGS += \ -DBUILD_MANS=false \ diff --git a/net/knot-resolver/Makefile b/net/knot-resolver/Makefile index 4d1ede85d..23d6f4423 100644 --- a/net/knot-resolver/Makefile +++ b/net/knot-resolver/Makefile @@ -21,11 +21,10 @@ PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com> PKG_LICENSE:=GPL-3.0-later PKG_LICENSE_FILES:=COPYING -PKG_BUILD_DEPENDS:=meson/host PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/knot-resolver SECTION:=net diff --git a/net/lighttpd/Makefile b/net/lighttpd/Makefile index 56e7b8161..bef14ca38 100644 --- a/net/lighttpd/Makefile +++ b/net/lighttpd/Makefile @@ -23,13 +23,12 @@ PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:lighttpd:lighttpd PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=meson/host PKG_CONFIG_DEPENDS:=CONFIG_LIGHTTPD_SSL $(patsubst %,CONFIG_PACKAGE_lighttpd-mod-%,$(REBUILD_MODULES)) REBUILD_MODULES=authn_gssapi authn_ldap authn_mysql cml magnet mysql_vhost trigger_b4_dl webdav include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/lighttpd/Default SECTION:=net diff --git a/net/sshfs/Makefile b/net/sshfs/Makefile index 0dcc741d7..c612d418c 100644 --- a/net/sshfs/Makefile +++ b/net/sshfs/Makefile @@ -23,7 +23,7 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/sshfs TITLE:=SSHFS diff --git a/sound/mpc/Makefile b/sound/mpc/Makefile index 9b64c1527..4365c2f6a 100644 --- a/sound/mpc/Makefile +++ b/sound/mpc/Makefile @@ -17,11 +17,10 @@ PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net> PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING -PKG_BUILD_DEPENDS:=meson/host PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk MESON_ARGS+=-Diconv=disabled -Ddocumentation=disabled diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile index 0a617eaa7..f6e418c10 100644 --- a/sound/mpd/Makefile +++ b/sound/mpd/Makefile @@ -26,7 +26,7 @@ PKG_USE_MIPS16:=0 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/mpd/Default SECTION:=sound diff --git a/sound/pulseaudio/Makefile b/sound/pulseaudio/Makefile index f16ab6d08..cd4101028 100644 --- a/sound/pulseaudio/Makefile +++ b/sound/pulseaudio/Makefile @@ -22,11 +22,10 @@ PKG_CPE_ID:=cpe:/a:pulseaudio:pulseaudio PKG_INSTALL:=1 PKG_USE_MIPS16:=0 -PKG_BUILD_DEPENDS:=meson/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/pulseaudio/Default SECTION:=sound diff --git a/utils/bonnie++/Makefile b/utils/bonnie++/Makefile index 5f3442749..974115513 100644 --- a/utils/bonnie++/Makefile +++ b/utils/bonnie++/Makefile @@ -20,10 +20,9 @@ PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=copyright.txt PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=meson/host include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/bonniexx SECTION:=utils diff --git a/utils/conmon/Makefile b/utils/conmon/Makefile index 40c58a649..a07799669 100644 --- a/utils/conmon/Makefile +++ b/utils/conmon/Makefile @@ -12,11 +12,11 @@ PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com> PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE -PKG_BUILD_DEPENDS:=golang/host meson/host +PKG_BUILD_DEPENDS:=golang/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/conmon SECTION:=utils diff --git a/utils/flashrom/Makefile b/utils/flashrom/Makefile index f7e374db7..ba9653cf2 100644 --- a/utils/flashrom/Makefile +++ b/utils/flashrom/Makefile @@ -21,10 +21,9 @@ PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=meson/host include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk include flashrom.mk define Package/flashrom/default diff --git a/utils/fontconfig/Makefile b/utils/fontconfig/Makefile index 4ef73c5a1..5d16f752c 100644 --- a/utils/fontconfig/Makefile +++ b/utils/fontconfig/Makefile @@ -24,7 +24,7 @@ PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=gperf/host include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/fontconfig SECTION:=xorg-util diff --git a/utils/fuse3/Makefile b/utils/fuse3/Makefile index cd0911899..7012f6b44 100644 --- a/utils/fuse3/Makefile +++ b/utils/fuse3/Makefile @@ -21,10 +21,9 @@ PKG_MAINTAINER:= PKG_CPE_ID:=cpe:/a:fuse_project:fuse PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=meson/host include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/fuse3/Default TITLE:=FUSE diff --git a/utils/qemu/Makefile b/utils/qemu/Makefile index 406270d09..ddd04a6a2 100644 --- a/utils/qemu/Makefile +++ b/utils/qemu/Makefile @@ -23,7 +23,7 @@ PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 PKG_USE_MIPS16:=0 -PKG_BUILD_DEPENDS+=spice-protocol meson/host +PKG_BUILD_DEPENDS+=spice-protocol include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/package.mk diff --git a/utils/tang/Makefile b/utils/tang/Makefile index 0e006cb05..146622d2c 100644 --- a/utils/tang/Makefile +++ b/utils/tang/Makefile @@ -20,10 +20,9 @@ PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=meson/host include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk define Package/tang SECTION:=utils diff --git a/utils/zstd/Makefile b/utils/zstd/Makefile index 254967919..62e82d6a2 100644 --- a/utils/zstd/Makefile +++ b/utils/zstd/Makefile @@ -12,11 +12,10 @@ PKG_MAINTAINER:= PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING -PKG_BUILD_DEPENDS:=meson/host PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/meson/meson.mk +include $(INCLUDE_DIR)/meson.mk MESON_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/build/meson/openwrt-build |