From 84d7a513937f46c1b562ee483c5c67e1b2822687 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Fri, 20 Sep 2019 13:27:21 +0200 Subject: [PATCH] meson: add new package This adds a host as well as a target package. meson.mk is provided to build packages using meson. Signed-off-by: Andre Heider --- devel/meson/Makefile | 56 ++++++++++++ devel/meson/meson.mk | 124 ++++++++++++++++++++++++++ devel/meson/src/openwrt-cross.txt.in | 25 ++++++ devel/meson/src/openwrt-native.txt.in | 15 ++++ 4 files changed, 220 insertions(+) create mode 100644 devel/meson/Makefile create mode 100644 devel/meson/meson.mk create mode 100644 devel/meson/src/openwrt-cross.txt.in create mode 100644 devel/meson/src/openwrt-native.txt.in diff --git a/devel/meson/Makefile b/devel/meson/Makefile new file mode 100644 index 00000000000000..1d378f26b14078 --- /dev/null +++ b/devel/meson/Makefile @@ -0,0 +1,56 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=meson +PKG_VERSION:=0.52.0 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/mesonbuild/meson/tar.gz/$(PKG_VERSION)? +PKG_HASH:=0f426ed1362c38bcc5b9027ec6aec3445d6db88e8d7249ed992e9af88a42d0e0 + +PKG_MAINTAINER:=Andre Heider +PKG_LICENSE:=Apache-2.0 +PKG_LICENSE_FILES:=COPYING + +HOST_BUILD_DEPENDS:=ninja/host + +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 + VARIANT:=python3 +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 new file mode 100644 index 00000000000000..7645284acdd1df --- /dev/null +++ b/devel/meson/meson.mk @@ -0,0 +1,124 @@ +# 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 + +include $(dir $(lastword $(MAKEFILE_LIST)))/../../devel/ninja/ninja.mk + +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:= + +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@|$(HOSTCC)|" \ + -e "s|@CXX@|$(HOSTCXX)|" \ + -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@|$(TARGET_CC)|" \ + -e "s|@CXX@|$(TARGET_CXX)|" \ + -e "s|@AR@|$(TARGET_AR)|" \ + -e "s|@STRIP@|$(TARGET_CROSS)strip|" \ + -e "s|@NM@|$(TARGET_NM)|" \ + -e "s|@LD@|$(TARGET_CROSS)ld|" \ + -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@|$(ARCH)|" \ + -e "s|@CPU@|$(CONFIG_TARGET_SUBTARGET)|" \ + -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 + $(call Ninja,-C $(MESON_HOST_BUILD_DIR),) +endef + +define Host/Install/Meson + $(call Ninja,-C $(MESON_HOST_BUILD_DIR) install,) +endef + +define Host/Uninstall/Meson + -$(call 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) \ + $(PKG_BUILD_DIR), \ + $(MESON_VARS)) +endef + +define Build/Compile/Meson + $(call Ninja,-C $(MESON_BUILD_DIR),) +endef + +define Build/Install/Meson + $(call Ninja,-C $(MESON_BUILD_DIR) install,DESTDIR="$(PKG_INSTALL_DIR)") +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 new file mode 100644 index 00000000000000..63640585ff431e --- /dev/null +++ b/devel/meson/src/openwrt-cross.txt.in @@ -0,0 +1,25 @@ +[binaries] +c = '@CC@' +cpp = '@CXX@' +ar = '@AR@' +strip = '@STRIP@' +nm = '@NM@' +ld = '@LD@' +pkgconfig = '@PKGCONFIG@' + +[properties] +c_args = [@CFLAGS@] +c_link_args = [@LDFLAGS@] +cpp_args = [@CXXFLAGS@] +cpp_link_args = [@LDFLAGS@] +needs_exe_wrapper = true + +[host_machine] +system = 'linux' +cpu_family = '@ARCH@' +cpu = '@CPU@' +endian = '@ENDIAN@' + +[paths] +prefix = '/usr' +libdir = 'lib' diff --git a/devel/meson/src/openwrt-native.txt.in b/devel/meson/src/openwrt-native.txt.in new file mode 100644 index 00000000000000..30990eb3c16b7e --- /dev/null +++ b/devel/meson/src/openwrt-native.txt.in @@ -0,0 +1,15 @@ +[binaries] +c = '@CC@' +cpp = '@CXX@' +pkgconfig = '@PKGCONFIG@' + +[properties] +c_args = [@CFLAGS@] +c_link_args = [@LDFLAGS@] +cpp_args = [@CXXFLAGS@] +cpp_link_args = [@LDFLAGS@] + +[paths] +prefix = '@PREFIX@' +sbindir = 'bin' +libdir = 'lib'