diff options
author | Rosen Penev <rosenp@gmail.com> | 2021-09-07 15:24:45 -0700 |
---|---|---|
committer | Rosen Penev <rosenp@gmail.com> | 2021-09-17 22:06:52 -0700 |
commit | 5ccd4d1c250acb3d3e65f16e55926ef0bc80153d (patch) | |
tree | 7f154afba065089345ccb54b9f8fd104f5c681c1 /utils | |
parent | 9a172a52fbd293c742d02cdb49f77ddf06928c7f (diff) |
treewide: compile with tools/meson
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'utils')
-rw-r--r-- | utils/bonnie++/Makefile | 3 | ||||
-rw-r--r-- | utils/conmon/Makefile | 4 | ||||
-rw-r--r-- | utils/flashrom/Makefile | 3 | ||||
-rw-r--r-- | utils/fontconfig/Makefile | 2 | ||||
-rw-r--r-- | utils/fuse3/Makefile | 3 | ||||
-rw-r--r-- | utils/qemu/Makefile | 2 | ||||
-rw-r--r-- | utils/tang/Makefile | 3 | ||||
-rw-r--r-- | utils/zstd/Makefile | 3 |
8 files changed, 9 insertions, 14 deletions
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 |