From 468572af01e708aa017d1c58ff53070d1a255077 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 17 Sep 2021 15:16:09 -0700 Subject: [PATCH] meson: remove This is in base now. Signed-off-by: Rosen Penev --- devel/meson/Makefile | 53 ---------- devel/meson/meson.mk | 147 -------------------------- devel/meson/src/openwrt-cross.txt.in | 23 ---- devel/meson/src/openwrt-native.txt.in | 13 --- 4 files changed, 236 deletions(-) delete mode 100644 devel/meson/Makefile delete mode 100644 devel/meson/meson.mk delete mode 100644 devel/meson/src/openwrt-cross.txt.in delete mode 100644 devel/meson/src/openwrt-native.txt.in diff --git a/devel/meson/Makefile b/devel/meson/Makefile deleted file mode 100644 index 5a17af5d3..000000000 --- a/devel/meson/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=meson -PKG_VERSION:=0.57.2 -PKG_RELEASE:=$(AUTORELEASE) - -PYPI_NAME:=meson -PKG_HASH:=3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5 - -PKG_MAINTAINER:=Andre Heider -PKG_LICENSE:=Apache-2.0 -PKG_LICENSE_FILES:=COPYING - -include ../../lang/python/pypi.mk -include $(INCLUDE_DIR)/host-build.mk -include $(INCLUDE_DIR)/package.mk -include ../../lang/python/python3-package.mk - -define Host/Configure -endef - -define Host/Compile -endef - -define Host/Install - $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/lib/meson - $(CP) $(HOST_BUILD_DIR)/* $(STAGING_DIR_HOSTPKG)/lib/meson/ -endef - -define Host/Clean - $(call Host/Clean/Default) - rm -rf $(STAGING_DIR_HOSTPKG)/lib/meson -endef - -define Package/meson - SECTION:=devel - CATEGORY:=Development - TITLE:=meson - URL:=https://mesonbuild.com/ - DEPENDS:=+ninja +python3-pkg-resources -endef - -define Package/meson/description - Meson is an open source build system meant to be both extremely fast, and, even more importantly, as user friendly as possible. -endef - -define Package/meson/install -endef - -$(eval $(call HostBuild)) -$(eval $(call Py3Package,meson)) -$(eval $(call BuildPackage,meson)) -$(eval $(call BuildPackage,meson-src)) diff --git a/devel/meson/meson.mk b/devel/meson/meson.mk deleted file mode 100644 index c1fa78d75..000000000 --- a/devel/meson/meson.mk +++ /dev/null @@ -1,147 +0,0 @@ -# To build your package using meson: -# -# PKG_BUILD_DEPENDS:=meson/host -# include ../../devel/meson/meson.mk -# MESON_ARGS+=-Dfoo -Dbar=baz -# -# To pass additional environment variables to meson: -# -# MESON_VARS+=FOO=bar -# -# Default configure/compile/install targets are provided, but can be -# overwritten if required: -# -# define Build/Configure -# $(call Build/Configure/Meson) -# ... -# endef -# -# same for Build/Compile and Build/Install -# -# Host packages are built in the same fashion, just use these vars instead: -# -# HOST_BUILD_DEPENDS:=meson/host -# MESON_HOST_ARGS+=-Dfoo -Dbar=baz -# MESON_HOST_VARS+=FOO=bar - -PKG_BUILD_PARALLEL ?= 1 -HOST_BUILD_PARALLEL ?= 1 - -MESON_DIR:=$(STAGING_DIR_HOSTPKG)/lib/meson - -MESON_HOST_BUILD_DIR:=$(HOST_BUILD_DIR)/openwrt-build -MESON_HOST_VARS:= -MESON_HOST_ARGS:= - -MESON_BUILD_DIR:=$(PKG_BUILD_DIR)/openwrt-build -MESON_VARS:= -MESON_ARGS:= - -ifneq ($(findstring i386,$(CONFIG_ARCH)),) -MESON_ARCH:="x86" -else ifneq ($(findstring powerpc64,$(CONFIG_ARCH)),) -MESON_ARCH:="ppc64" -else ifneq ($(findstring powerpc,$(CONFIG_ARCH)),) -MESON_ARCH:="ppc" -else ifneq ($(findstring mips64el,$(CONFIG_ARCH)),) -MESON_ARCH:="mips64" -else ifneq ($(findstring mipsel,$(CONFIG_ARCH)),) -MESON_ARCH:="mips" -else ifneq ($(findstring armeb,$(CONFIG_ARCH)),) -MESON_ARCH:="arm" -else -MESON_ARCH:=$(CONFIG_ARCH) -endif - -# this is undefined for just x64_64 -ifeq ($(origin CPU_TYPE),undefined) -MESON_CPU:="generic" -else -MESON_CPU:="$(CPU_TYPE)$(if $(CPU_SUBTYPE),+$(CPU_SUBTYPE))" -endif - -define Meson - $(2) $(STAGING_DIR_HOST)/bin/$(PYTHON) $(MESON_DIR)/meson.py $(1) -endef - -define Meson/CreateNativeFile - $(STAGING_DIR_HOST)/bin/sed \ - -e "s|@CC@|$(foreach BIN,$(HOSTCC),'$(BIN)',)|" \ - -e "s|@CXX@|$(foreach BIN,$(HOSTCXX),'$(BIN)',)|" \ - -e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \ - -e "s|@CFLAGS@|$(foreach FLAG,$(HOST_CFLAGS) $(HOST_CPPFLAGS),'$(FLAG)',)|" \ - -e "s|@CXXFLAGS@|$(foreach FLAG,$(HOST_CXXFLAGS) $(HOST_CPPFLAGS),'$(FLAG)',)|" \ - -e "s|@LDFLAGS@|$(foreach FLAG,$(HOST_LDFLAGS),'$(FLAG)',)|" \ - -e "s|@PREFIX@|$(STAGING_DIR_HOSTPKG)|" \ - < $(MESON_DIR)/openwrt-native.txt.in \ - > $(1) -endef - -define Meson/CreateCrossFile - $(STAGING_DIR_HOST)/bin/sed \ - -e "s|@CC@|$(foreach BIN,$(TARGET_CC),'$(BIN)',)|" \ - -e "s|@CXX@|$(foreach BIN,$(TARGET_CXX),'$(BIN)',)|" \ - -e "s|@AR@|$(TARGET_AR)|" \ - -e "s|@STRIP@|$(TARGET_CROSS)strip|" \ - -e "s|@NM@|$(TARGET_NM)|" \ - -e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \ - -e "s|@CFLAGS@|$(foreach FLAG,$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \ - -e "s|@CXXFLAGS@|$(foreach FLAG,$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \ - -e "s|@LDFLAGS@|$(foreach FLAG,$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS),'$(FLAG)',)|" \ - -e "s|@ARCH@|$(MESON_ARCH)|" \ - -e "s|@CPU@|$(MESON_CPU)|" \ - -e "s|@ENDIAN@|$(if $(CONFIG_BIG_ENDIAN),big,little)|" \ - < $(MESON_DIR)/openwrt-cross.txt.in \ - > $(1) -endef - -define Host/Configure/Meson - $(call Meson/CreateNativeFile,$(HOST_BUILD_DIR)/openwrt-native.txt) - $(call Meson, \ - --native-file $(HOST_BUILD_DIR)/openwrt-native.txt \ - $(MESON_HOST_ARGS) \ - $(MESON_HOST_BUILD_DIR) \ - $(HOST_BUILD_DIR), \ - $(MESON_HOST_VARS)) -endef - -define Host/Compile/Meson - +$(NINJA) -C $(MESON_HOST_BUILD_DIR) $(1) -endef - -define Host/Install/Meson - +$(NINJA) -C $(MESON_HOST_BUILD_DIR) install -endef - -define Host/Uninstall/Meson - +$(NINJA) -C $(MESON_HOST_BUILD_DIR) uninstall -endef - -define Build/Configure/Meson - $(call Meson/CreateNativeFile,$(PKG_BUILD_DIR)/openwrt-native.txt) - $(call Meson/CreateCrossFile,$(PKG_BUILD_DIR)/openwrt-cross.txt) - $(call Meson, \ - --buildtype plain \ - --native-file $(PKG_BUILD_DIR)/openwrt-native.txt \ - --cross-file $(PKG_BUILD_DIR)/openwrt-cross.txt \ - $(MESON_ARGS) \ - $(MESON_BUILD_DIR) \ - $(MESON_BUILD_DIR)/.., \ - $(MESON_VARS)) -endef - -define Build/Compile/Meson - +$(NINJA) -C $(MESON_BUILD_DIR) $(1) -endef - -define Build/Install/Meson - +DESTDIR="$(PKG_INSTALL_DIR)" $(NINJA) -C $(MESON_BUILD_DIR) install -endef - -Host/Configure=$(call Host/Configure/Meson) -Host/Compile=$(call Host/Compile/Meson) -Host/Install=$(call Host/Install/Meson) -Host/Uninstall=$(call Host/Uninstall/Meson) -Build/Configure=$(call Build/Configure/Meson) -Build/Compile=$(call Build/Compile/Meson) -Build/Install=$(call Build/Install/Meson) diff --git a/devel/meson/src/openwrt-cross.txt.in b/devel/meson/src/openwrt-cross.txt.in deleted file mode 100644 index 30b4c116c..000000000 --- a/devel/meson/src/openwrt-cross.txt.in +++ /dev/null @@ -1,23 +0,0 @@ -[binaries] -c = [@CC@] -cpp = [@CXX@] -ar = '@AR@' -strip = '@STRIP@' -nm = '@NM@' -pkgconfig = '@PKGCONFIG@' - -[built-in options] -c_args = [@CFLAGS@] -c_link_args = [@LDFLAGS@] -cpp_args = [@CXXFLAGS@] -cpp_link_args = [@LDFLAGS@] -prefix = '/usr' - -[host_machine] -system = 'linux' -cpu_family = '@ARCH@' -cpu = '@CPU@' -endian = '@ENDIAN@' - -[properties] -needs_exe_wrapper = true diff --git a/devel/meson/src/openwrt-native.txt.in b/devel/meson/src/openwrt-native.txt.in deleted file mode 100644 index 50308ec8e..000000000 --- a/devel/meson/src/openwrt-native.txt.in +++ /dev/null @@ -1,13 +0,0 @@ -[binaries] -c = [@CC@] -cpp = [@CXX@] -pkgconfig = '@PKGCONFIG@' - -[built-in options] -c_args = [@CFLAGS@] -c_link_args = [@LDFLAGS@] -cpp_args = [@CXXFLAGS@] -cpp_link_args = [@LDFLAGS@] -prefix = '@PREFIX@' -sbindir = 'bin' -libdir = 'lib'