Message ID | df0808d07efd1959cfca0558857283d2e7240f4a.1356723702.git.thomas.petazzoni@free-electrons.com |
---|---|
State | Superseded |
Headers | show |
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> ---
Thomas> package/Config.in | 1 +
Thomas> package/enlightenment/Config.in | 29 ++++++++++++++
Thomas> .../enlightenment/enlightenment-no-execinfo.patch | 27 +++++++++++++
Thomas> package/enlightenment/enlightenment.mk | 40 ++++++++++++++++++++
Thomas> 4 files changed, 97 insertions(+)
Thomas> create mode 100644 package/enlightenment/Config.in
Thomas> create mode 100644 package/enlightenment/enlightenment-no-execinfo.patch
Thomas> create mode 100644 package/enlightenment/enlightenment.mk
Thomas> diff --git a/package/Config.in b/package/Config.in
Thomas> index 3d556b2..97a28c8 100644
Thomas> --- a/package/Config.in
Thomas> +++ b/package/Config.in
Thomas> @@ -151,6 +151,7 @@ source "package/liberation/Config.in"
Thomas> source "package/libsexy/Config.in"
Thomas> comment "X Window managers"
Thomas> +source "package/enlightenment/Config.in"
Thomas> source "package/matchbox/Config.in"
Thomas> source "package/metacity/Config.in"
Thomas> source "package/blackbox/Config.in"
Thomas> diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in
Thomas> new file mode 100644
Thomas> index 0000000..d973813
Thomas> --- /dev/null
Thomas> +++ b/package/enlightenment/Config.in
Thomas> @@ -0,0 +1,29 @@
Thomas> +config BR2_PACKAGE_ENLIGHTENMENT
Thomas> + bool "enlightenment"
Thomas> + select BR2_PACKAGE_LIBECORE
Thomas> + select BR2_PACKAGE_LIBECORE_X
Thomas> + select BR2_PACKAGE_LIBEINA
Thomas> + select BR2_PACKAGE_LIBEET
Thomas> + select BR2_PACKAGE_LIBEVAS
Thomas> + select BR2_PACKAGE_LIBEVAS_JPEG
Thomas> + select BR2_PACKAGE_LIBEVAS_PNG
Thomas> + select BR2_PACKAGE_LIBEVAS_EET
Thomas> + select BR2_PACKAGE_LIBECORE_EVAS
Thomas> + select BR2_PACKAGE_LIBEDJE
Thomas> + select BR2_PACKAGE_LIBEFREET
Thomas> + select BR2_PACKAGE_LIBEDBUS
Thomas> + select BR2_PACKAGE_LIBEIO
Thomas> + select BR2_PACKAGE_XCB_UTIL_KEYSYMS
Thomas> + select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
Thomas> + select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
Thomas> + # libevas-generic-loaders-svg -> librsvg -> glib2
Thomas> + depends on BR2_USE_WCHAR
Thomas> + # libedbus -> dbus
Thomas> + depends on BR2_TOOLCHAIN_HAS_THREADS
Thomas> + # libedbus -> dbus
Thomas> + depends on BR2_USE_MMU
Thomas> + depends on BR2_PACKAGE_XORG7
Thomas> +
No help text?
Thomas> +++ b/package/enlightenment/enlightenment-no-execinfo.patch
Thomas> @@ -0,0 +1,27 @@
Thomas> +Do not include <execinfo.h> when not available
Thomas> +
Thomas> +On uClibc, <execinfo.h> is not necessarily installed, depending on the
Thomas> +configuration. Enlightenment properly makes <execinfo.h> optional, but
Thomas> +uses __GLIBC__ to check if it is available or not. Unfortunately,
Thomas> +uClibc defines __GLIBC__, so it is not the right way to decide if
Thomas> +<execinfo.h> is available.
Thomas> +
Thomas> +Instead, Enlightenment already has a configure.ac check for
Thomas> +execinfo.h, so we simply use the result of this configure.ac check to
Thomas> +decide whether execinfo.h is to be included or not.
Thomas> +
Thomas> +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Don't forget to send this upstream.
diff --git a/package/Config.in b/package/Config.in index 3d556b2..97a28c8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -151,6 +151,7 @@ source "package/liberation/Config.in" source "package/libsexy/Config.in" comment "X Window managers" +source "package/enlightenment/Config.in" source "package/matchbox/Config.in" source "package/metacity/Config.in" source "package/blackbox/Config.in" diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in new file mode 100644 index 0000000..d973813 --- /dev/null +++ b/package/enlightenment/Config.in @@ -0,0 +1,29 @@ +config BR2_PACKAGE_ENLIGHTENMENT + bool "enlightenment" + select BR2_PACKAGE_LIBECORE + select BR2_PACKAGE_LIBECORE_X + select BR2_PACKAGE_LIBEINA + select BR2_PACKAGE_LIBEET + select BR2_PACKAGE_LIBEVAS + select BR2_PACKAGE_LIBEVAS_JPEG + select BR2_PACKAGE_LIBEVAS_PNG + select BR2_PACKAGE_LIBEVAS_EET + select BR2_PACKAGE_LIBECORE_EVAS + select BR2_PACKAGE_LIBEDJE + select BR2_PACKAGE_LIBEFREET + select BR2_PACKAGE_LIBEDBUS + select BR2_PACKAGE_LIBEIO + select BR2_PACKAGE_XCB_UTIL_KEYSYMS + select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS + select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG + # libevas-generic-loaders-svg -> librsvg -> glib2 + depends on BR2_USE_WCHAR + # libedbus -> dbus + depends on BR2_TOOLCHAIN_HAS_THREADS + # libedbus -> dbus + depends on BR2_USE_MMU + depends on BR2_PACKAGE_XORG7 + +comment "enlightenment requires WCHAR and thread support in toolchain" + depends on BR2_PACKAGE_XORG7 + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/enlightenment/enlightenment-no-execinfo.patch b/package/enlightenment/enlightenment-no-execinfo.patch new file mode 100644 index 0000000..81fbe17 --- /dev/null +++ b/package/enlightenment/enlightenment-no-execinfo.patch @@ -0,0 +1,27 @@ +Do not include <execinfo.h> when not available + +On uClibc, <execinfo.h> is not necessarily installed, depending on the +configuration. Enlightenment properly makes <execinfo.h> optional, but +uses __GLIBC__ to check if it is available or not. Unfortunately, +uClibc defines __GLIBC__, so it is not the right way to decide if +<execinfo.h> is available. + +Instead, Enlightenment already has a configure.ac check for +execinfo.h, so we simply use the result of this configure.ac check to +decide whether execinfo.h is to be included or not. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: b/src/bin/e.h +=================================================================== +--- a/src/bin/e.h ++++ b/src/bin/e.h +@@ -92,7 +92,7 @@ + # include <memcheck.h> + # endif + +-# ifdef __GLIBC__ ++# ifdef HAVE_EXECINFO_H + # include <execinfo.h> + # endif + diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk new file mode 100644 index 0000000..cd3b21f --- /dev/null +++ b/package/enlightenment/enlightenment.mk @@ -0,0 +1,40 @@ +############################################################# +# +# enlightenment +# +############################################################# + +ENLIGHTENMENT_VERSION = 0.17.0-omega +ENLIGHTENMENT_SITE = http://download.enlightenment.org/releases/ +ENLIGHTENMENT_LICENSE = BSD-2c +ENLIGHTENMENT_LICENSE_FILES = COPYING + +ENLIGHTENMENT_DEPENDENCIES = \ + host-pkgconf \ + libecore \ + libeet \ + libeina \ + libevas \ + libevas-generic-loaders \ + libedje \ + libefreet \ + libedbus \ + libeio \ + host-libedje \ + host-libeet \ + xcb-util-keysyms + +ENLIGHTENMENT_CONF_OPT = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \ + --with-eet-eet=$(HOST_DIR)/usr/bin/eet \ + --disable-rpath + +ifeq ($(BR2_HAVE_DOCUMENTATION),) +define ENLIGHTENMENT_REMOVE_DOCUMENTATION + rm -rf $(TARGET_DIR)/usr/share/enlightenment/doc/ + rm -f $(TARGET_DIR)/usr/share/enlightenment/COPYING + rm -f $(TARGET_DIR)/usr/share/enlightenment/AUTHORS +endef +ENLIGHTENMENT_POST_INSTALL_TARGET_HOOKS += ENLIGHTENMENT_REMOVE_DOCUMENTATION +endif + +$(eval $(autotools-package))
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/Config.in | 1 + package/enlightenment/Config.in | 29 ++++++++++++++ .../enlightenment/enlightenment-no-execinfo.patch | 27 +++++++++++++ package/enlightenment/enlightenment.mk | 40 ++++++++++++++++++++ 4 files changed, 97 insertions(+) create mode 100644 package/enlightenment/Config.in create mode 100644 package/enlightenment/enlightenment-no-execinfo.patch create mode 100644 package/enlightenment/enlightenment.mk