treewide: compile with tools/meson

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/devel/pkgconf/Makefile b/devel/pkgconf/Makefile
index 1a9e12c80ca3263ad029afae99625728aee010e7..240f042308a3cf4c9d6a3838971c18ea7b93ef6c 100644 (file)
--- 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 1ff9d3dcbf62427e13fb8b7d4572898b4fca001b..7dc7daa659b0d49cae023b6be7c551fe9baefa12 100644 (file)
--- 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 bef2c481b92804c310c6096cce29ee32e20e26d6..9e5eec34a8f405ec23ceb6b5cd1382944b2cd6f3 100644 (file)
--- 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 d6d602195f9cbee213d288f7127e4b8abef769e7..1be4697180c0f6dd47a9d1a13a9a75468506af4c 100644 (file)
--- 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 c865808df6fb6154bfc1805863ac3085c3cafe4c..a94e5705d05b84b36dcc76f36297616d91fd9c07 100644 (file)
--- 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 94d31a86d1aa43644f5f7a85b6bdf1629f877278..ee9b3936208f4275400533b73022530f693259cc 100644 (file)
--- 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 206748878305c8cd99e2a4e29e18853095a5e533..444d64ad6d4a7b33be3c74fbe63f8f6c6c1da92e 100644 (file)
--- 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 50c66840c0bd8054a5ca3452822f1428a90a81a9..5f7d7a979f1e2d3af3ff85c950ed79ebe5883ff8 100644 (file)
--- 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 31b9213707359cf3b1e3a774041e1212ea058f75..f2858c55737b9cd7dea6b55eaf58b7aa076660fa 100644 (file)
--- 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 5ee4c7053ebcaf152ba4c9ed9f8fdfc9ccc5f3fd..1d174fb4341d9cba2526cb8787a1b8ff1928f2c3 100644 (file)
--- 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 45ec539119cb1f968f3fa6a53fc71e16144fadff..96723e711e2483efaf4cc932cb8c50f6114fec6f 100644 (file)
--- 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 6271ba447865c21dbe685794abce0204c2884398..91f445e6c1fafdac8d70175fe7d4a080ae2b9a93 100644 (file)
--- 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 ffd6758e94f1b6804cbec06630c027d340803ca5..c9a047d8bba761539155212bb9d673fdbf537278 100644 (file)
--- 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 9eae2fba24d2a4ac4d1b3376d8993cc09c8dfc25..4a7fd18b0ccf4081d2458eff06d5a3d4ac459ad2 100644 (file)
--- 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 bb2d210a4137ba05b8f9951bcbf75d879bb83ae5..004616d2910f08bdb8a7c533170ebadb096f5148 100644 (file)
--- 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 bf5724144d5cf01a8e902d2f3319be40384421d7..41f6e8f674c3364d7157a370b57b49c851bc072d 100644 (file)
--- 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 97e8b7d96d752b4c2b65da9b1cac44d0e00882c2..66f404fb50d6e3220ac039abb694a7c5fc86c93a 100644 (file)
--- 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 94fcebe72c0e456cc7aedb7849423c56dd68957d..a6cebc025e367439bccd66f593201b5e2c16c865 100644 (file)
--- 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 e386e1e03f0656f9fdb12c4046d9b93ba712e92e..46640116eaa4b2fdf06312957fe44835d0b7e2af 100644 (file)
--- 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 3a769afb87c1836d728425de6e5b0fb3ae96256c..268e01da4aa3fc181a7d4d6a9b2d377dcbc37e43 100644 (file)
--- 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 3332dd5e93e519d1564ff5a4138578234f62f310..4fab78435fecb07c8f91b70af13a0017e1782225 100644 (file)
--- 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 419026d95b53f8658b878d6b5be3035be130c0db..116f0a9a0c94ecd9fe645639d8e8c9d57652b83e 100644 (file)
--- 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 27efc41c3dc0e516fd9a7c23e1572336720a3398..e199213f1c7897b7eb4b94c6d0283d6866ad4b7e 100644 (file)
--- 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 3954576a639c9fd1e940171b33290471bd729071..c8ac5cac93ab26f7db43aed92f16548df441ecaa 100644 (file)
--- 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 5ee5e52c88cd148df1291c5137a91d1aaef76557..d9fea5c218d3f69bf94ce7e3535c31ba3c8d9269 100644 (file)
--- 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 c32dec8703027e08e3ffb5abb8ec1b67a8937b59..28973bf18be35f06889c4c7dc932cf5709b12a15 100644 (file)
--- 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 4439e3e81292aa7a1295b92254fa36a2758c0522..f597f2a5a988123c3345d06170301f10b318a75a 100644 (file)
--- 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 9175227a5fe179bdb9d38d5e173f84908fb216ef..fee7795d3568d28c7589a7292284dcbae4d1ba7e 100644 (file)
--- 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 f2eabc95d61abf070907239b9d5d5935bd82966c..a022bad391ba25b5b8efef4b00af343c1792d20a 100644 (file)
--- 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 b702dd61aba9ea85c367ea9cc40b85d88b61d980..4b145006fedb776bb9103121ae88820a6e303738 100644 (file)
--- 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 4d1ede85dcaa3a809f81abcfe82aa84799e4008b..23d6f4423407ed800db084d980cab280491857e5 100644 (file)
--- 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 56e7b8161034cb538d6615f8983b0fd275eb3706..bef14ca380a0e7420e11dd70a024b2bc7a31af8c 100644 (file)
--- 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 0dcc741d7906b46d7e67c9ccff8f8c68cbeed5a7..c612d418c4ca0b012e379775f8451925c360a153 100644 (file)
--- 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 9b64c152722f924c872172b46125e6d945fecf91..4365c2f6aa92d4bd36620e8ead196ea972f4245d 100644 (file)
--- 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 0a617eaa70a9e257a97f750e91f9709b20ad8a81..f6e418c10f09fbc2ed413858a77e48fadf5b4dc8 100644 (file)
--- 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 f16ab6d0827a019bb3c27e97b074a5e77eef2ad6..cd4101028d4db01bda484dcca27c0dc3c595b73c 100644 (file)
--- 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 5f3442749a58755c3ea6628497bda3c6b0df0316..97411551327fb6b6ace1ac2b90dd80f1fcc94024 100644 (file)
--- 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 40c58a6499e40eb57fcc70e8acae7d268fd6f86c..a077996693c314cc5a4358fcd11d14272552d2d0 100644 (file)
--- 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 f7e374db76e24c1988527c1ec8b839ff3b77b2dd..ba9653cf2112d9ec8d8c2a692f27c293aed36c3d 100644 (file)
--- 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 4ef73c5a1eb88844e9baa731f709d71e288e981d..5d16f752c77122d84849d04f223294167e812d29 100644 (file)
--- 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 cd0911899f6b9b7643354815d16121f2cac02100..7012f6b4442e5ec03d56d7e40c5982a5e6526b54 100644 (file)
--- 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 406270d09cde684a91f897cb91b6b587f0059015..ddd04a6a2ae2d533d9e1211c6114bc75d80d0ccd 100644 (file)
--- 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 0e006cb05be4dd312abde71627379d80f78b1034..146622d2c7e700c4833fce8e99b49c52b688b702 100644 (file)
--- 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 2549679199b66857e05e8eaea647b2a494d6da27..62e82d6a2a44248e4990518576c5d966a16ec871 100644 (file)
--- 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