From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [RFC PATCH v2 8/8] enlightenment: convert to pkg-meson infra
Date: Tue, 15 May 2018 21:51:59 +0200 [thread overview]
Message-ID: <20180515195159.6694-9-eric.le.bihan.dev@free.fr> (raw)
In-Reply-To: <20180515195159.6694-1-eric.le.bihan.dev@free.fr>
Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
---
package/enlightenment/enlightenment.mk | 30 ++++++------------------------
1 file changed, 6 insertions(+), 24 deletions(-)
diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk
index 480e9e9da8..5bc1c5d6de 100644
--- a/package/enlightenment/enlightenment.mk
+++ b/package/enlightenment/enlightenment.mk
@@ -13,14 +13,10 @@ ENLIGHTENMENT_LICENSE_FILES = COPYING
ENLIGHTENMENT_DEPENDENCIES = \
host-pkgconf \
host-efl \
- host-meson \
efl \
xcb-util-keysyms
-ENLIGHTENMENT_MESON_OPTS += \
- --prefix=/usr \
- --buildtype=$(if $(BR2_ENABLE_DEBUG),debug,release) \
- --cross-file=$(HOST_DIR)/etc/meson/cross-compilation.conf \
+ENLIGHTENMENT_CONF_OPTS = \
-Dedje-cc=$(HOST_DIR)/bin/edje_cc \
-Deet=$(HOST_DIR)/bin/eet \
-Deldbus-codegen=$(HOST_DIR)/bin/eldbus-codegen \
@@ -30,38 +26,24 @@ ENLIGHTENMENT_MESON_OPTS += \
ENLIGHTENMENT_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
-ENLIGHTENMENT_MESON_OPTS += -Dsystemd=true
+ENLIGHTENMENT_CONF_OPTS += -Dsystemd=true
ENLIGHTENMENT_DEPENDENCIES += systemd
else
-ENLIGHTENMENT_MESON_OPTS += -Dsystemd=false
+ENLIGHTENMENT_CONF_OPTS += -Dsystemd=false
endif
# alsa backend needs mixer support
ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)
-ENLIGHTENMENT_MESON_OPTS += -Dmixer=true
+ENLIGHTENMENT_CONF_OPTS += -Dmixer=true
ENLIGHTENMENT_DEPENDENCIES += alsa-lib
else
-ENLIGHTENMENT_MESON_OPTS += -Dmixer=false
+ENLIGHTENMENT_CONF_OPTS += -Dmixer=false
endif
ifeq ($(BR2_PACKAGE_XKEYBOARD_CONFIG),y)
ENLIGHTENMENT_DEPENDENCIES += xkeyboard-config
endif
-define ENLIGHTENMENT_CONFIGURE_CMDS
- rm -rf $(@D)/build
- mkdir -p $(@D)/build
- $(TARGET_MAKE_ENV) meson $(ENLIGHTENMENT_MESON_OPTS) $(@D) $(@D)/build
-endef
-
-define ENLIGHTENMENT_BUILD_CMDS
- $(TARGET_MAKE_ENV) ninja -C $(@D)/build
-endef
-
-define ENLIGHTENMENT_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) ninja -C $(@D)/build install
-endef
-
define ENLIGHTENMENT_REMOVE_DOCUMENTATION
rm -rf $(TARGET_DIR)/usr/share/enlightenment/doc/
rm -f $(TARGET_DIR)/usr/share/enlightenment/COPYING
@@ -69,4 +51,4 @@ define ENLIGHTENMENT_REMOVE_DOCUMENTATION
endef
ENLIGHTENMENT_POST_INSTALL_TARGET_HOOKS += ENLIGHTENMENT_REMOVE_DOCUMENTATION
-$(eval $(generic-package))
+$(eval $(meson-package))
--
2.14.3
next prev parent reply other threads:[~2018-05-15 19:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-15 19:51 [Buildroot] [RFC PATCH v2 0/8] Add pkg-meson infrastructure Eric Le Bihan
2018-05-15 19:51 ` [Buildroot] [RFC PATCH v2 1/8] pkg-meson: new infrastructure Eric Le Bihan
2018-05-30 20:28 ` Thomas Petazzoni
2018-05-15 19:51 ` [Buildroot] [RFC PATCH v2 2/8] docs/manual: document pkg-meson infra Eric Le Bihan
2018-05-15 19:51 ` [Buildroot] [RFC PATCH v2 3/8] meson: prevent RPATH stripping Eric Le Bihan
2018-05-15 19:51 ` [Buildroot] [RFC PATCH v2 4/8] libmpdclient: convert to pkg-meson infra Eric Le Bihan
2018-05-15 19:51 ` [Buildroot] [RFC PATCH v2 5/8] systemd: " Eric Le Bihan
2018-05-15 19:51 ` [Buildroot] [RFC PATCH v2 6/8] ncmpc: " Eric Le Bihan
2018-05-15 19:51 ` [Buildroot] [RFC PATCH v2 7/8] mpd-mpc: " Eric Le Bihan
2018-05-15 19:51 ` Eric Le Bihan [this message]
2018-05-30 20:27 ` [Buildroot] [RFC PATCH v2 0/8] Add pkg-meson infrastructure Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180515195159.6694-9-eric.le.bihan.dev@free.fr \
--to=eric.le.bihan.dev@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.