diff options
| author | Romain Naour <romain.naour@openwide.fr> | 2015-12-19 17:39:13 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-12-20 14:06:08 +0100 |
| commit | 983b74fca799703dc3f22816e82e13bba3e4831b (patch) | |
| tree | e8390986ebb4843a5e93788ae022796e0e2be7b3 | |
| parent | 0a9a9cd4061265a5d8e14de3d0a32ebf094f0340 (diff) | |
| download | buildroot-983b74fca799703dc3f22816e82e13bba3e4831b.tar.gz buildroot-983b74fca799703dc3f22816e82e13bba3e4831b.zip | |
package/libelementary: move to package directory
As discussed on the list the two remaining packages in
package/efl subdirectory will be moved to package/
directory.
- Add the efl dependency to libelementary.
- Set LIBELEMENTARY_VERSION with the version number
directly.
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/Config.in | 1 | ||||
| -rw-r--r-- | package/efl/Config.in | 1 | ||||
| -rw-r--r-- | package/libelementary/Config.in (renamed from package/efl/libelementary/Config.in) | 3 | ||||
| -rw-r--r-- | package/libelementary/libelementary.hash (renamed from package/efl/libelementary/libelementary.hash) | 0 | ||||
| -rw-r--r-- | package/libelementary/libelementary.mk (renamed from package/efl/libelementary/libelementary.mk) | 2 |
5 files changed, 4 insertions, 3 deletions
diff --git a/package/Config.in b/package/Config.in index 45de28f2ba..5de57de033 100644 --- a/package/Config.in +++ b/package/Config.in @@ -252,6 +252,7 @@ endif source "package/fbv/Config.in" source "package/freerdp/Config.in" source "package/imagemagick/Config.in" + source "package/libelementary/Config.in" source "package/linux-fusion/Config.in" source "package/lite/Config.in" source "package/mesa3d/Config.in" diff --git a/package/efl/Config.in b/package/efl/Config.in index 80658b2f0c..7ef1b5bd9d 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -16,7 +16,6 @@ menuconfig BR2_PACKAGE_EFL if BR2_PACKAGE_EFL source "package/efl/libefl/Config.in" -source "package/efl/libelementary/Config.in" endif # BR2_PACKAGE_EFL diff --git a/package/efl/libelementary/Config.in b/package/libelementary/Config.in index ce597de6c7..54f8688c34 100644 --- a/package/efl/libelementary/Config.in +++ b/package/libelementary/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBELEMENTARY bool "libelementary" - select BR2_PACKAGE_LIBEFL + depends on BR2_PACKAGE_EFL depends on BR2_TOOLCHAIN_HAS_THREADS # elm_store.c depends on !BR2_STATIC_LIBS help @@ -11,4 +11,5 @@ config BR2_PACKAGE_LIBELEMENTARY https://enlightenment.org comment "libelementary needs a toolchain w/ threads, dynamic library" + depends on BR2_PACKAGE_EFL depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/efl/libelementary/libelementary.hash b/package/libelementary/libelementary.hash index 2cd36d8db8..2cd36d8db8 100644 --- a/package/efl/libelementary/libelementary.hash +++ b/package/libelementary/libelementary.hash diff --git a/package/efl/libelementary/libelementary.mk b/package/libelementary/libelementary.mk index c920801b2d..4ba8681dd7 100644 --- a/package/efl/libelementary/libelementary.mk +++ b/package/libelementary/libelementary.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBELEMENTARY_VERSION = $(EFL_VERSION) +LIBELEMENTARY_VERSION = 1.15.2 LIBELEMENTARY_SOURCE = elementary-$(LIBELEMENTARY_VERSION).tar.xz LIBELEMENTARY_SITE = http://download.enlightenment.org/rel/libs/elementary LIBELEMENTARY_LICENSE = LGPLv2.1 |
