aboutsummaryrefslogtreecommitdiff
path: root/package/sunxi-cedarx
diff options
context:
space:
mode:
authorGravatar Spenser Gilliland <spenser@gillilanding.com>2014-10-12 12:47:04 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2014-10-12 12:57:59 +0200
commita25b48ce6b516bad25ebe77a6ed34382e98f6db7 (patch)
treecae69f2a1a1ac77f8cd6a5756adbb79aaedb3d7e /package/sunxi-cedarx
parentc3bf16f884b8c5518a47dd95922bb4fc0bfc9d4b (diff)
downloadbuildroot-a25b48ce6b516bad25ebe77a6ed34382e98f6db7.tar.gz
buildroot-a25b48ce6b516bad25ebe77a6ed34382e98f6db7.tar.bz2
sunxi-cedarx: bump version, improve EABI support
This commit bumps the sunxi-cedarx package version to the latest git commit, which also provides a better support for ARM EABI, since it now has a non-EABIhf variant of avheap.so available. Built tested on ARM EABI and ARM EABIhf. [Thomas: compared to Spenser's original version, bumped to a newer version, and dropped support for the demo since it didn't build, and fixing it isn't trivial] Signed-off-by: Spenser Gilliland <spenser@gillilanding.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/sunxi-cedarx')
-rw-r--r--package/sunxi-cedarx/sunxi-cedarx.mk11
1 files changed, 6 insertions, 5 deletions
diff --git a/package/sunxi-cedarx/sunxi-cedarx.mk b/package/sunxi-cedarx/sunxi-cedarx.mk
index 54d081e0cd..219f1bc74b 100644
--- a/package/sunxi-cedarx/sunxi-cedarx.mk
+++ b/package/sunxi-cedarx/sunxi-cedarx.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SUNXI_CEDARX_VERSION = 74923e55fc3ef512d4cd2462da58ae5331611f37
+SUNXI_CEDARX_VERSION = b8f52d913f73720e50d8f1b2f8610467b575dc45
SUNXI_CEDARX_SITE = $(call github,linux-sunxi,cedarx-libs,$(SUNXI_CEDARX_VERSION))
SUNXI_CEDARX_INSTALL_STAGING = YES
@@ -14,7 +14,10 @@ SUNXI_CEDARX_CONFIGURE_OPTS = \
ifeq ($(BR2_ARM_EABIHF),y)
SUNXI_CEDARX_BIN_DIR = $(@D)/libcedarv/linux-armhf
-# libavheap.so is only available on EABIHF
+else
+SUNXI_CEDARX_BIN_DIR = $(@D)/libcedarv/linux-armel2
+endif
+
define SUNXI_CEDARX_BUILD_AVHEAP
$(TARGET_CC) $(TARGET_CFLAGS) \
-c $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/avheap.c \
@@ -25,13 +28,11 @@ define SUNXI_CEDARX_BUILD_AVHEAP
-o $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/libavheap.so \
$(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/avheap.o
endef
+
define SUNXI_CEDARX_INSTALL_AVHEAP
$(INSTALL) -D -m 755 $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/libavheap.so \
$(1)/usr/lib/libavheap.so
endef
-else
-SUNXI_CEDARX_BIN_DIR = $(@D)/libcedarv/linux-armel
-endif
define SUNXI_CEDARX_BUILD_CMDS
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(SUNXI_CEDARX_BIN_DIR) \