From patchwork Thu Sep 26 23:21:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Spenser Gilliland X-Patchwork-Id: 278299 X-Patchwork-Delegate: patrickdepinguin+buildroot@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id D9F162C00D1 for ; Fri, 27 Sep 2013 09:22:36 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E91A88BF30; Thu, 26 Sep 2013 23:22:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6zK3PY-s5+QE; Thu, 26 Sep 2013 23:22:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id B983D8BF4D; Thu, 26 Sep 2013 23:22:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D4F601BF98C for ; Thu, 26 Sep 2013 23:22:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CD6058BF18 for ; Thu, 26 Sep 2013 23:22:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id avo1GIRryuau for ; Thu, 26 Sep 2013 23:22:10 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ie0-f172.google.com (mail-ie0-f172.google.com [209.85.223.172]) by whitealder.osuosl.org (Postfix) with ESMTPS id 70AC08BF4F for ; Thu, 26 Sep 2013 23:22:09 +0000 (UTC) Received: by mail-ie0-f172.google.com with SMTP id x13so2321309ief.17 for ; Thu, 26 Sep 2013 16:22:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rqgfLWX15lfbarBwTJTW3u+uVwII/DBgc7D4pEIP130=; b=hq+cw+uRvqgGwEYnStgin3QQZoNRYB5UcTrvJIV9krDPoDMQEczXJw/5bF8CYEm6iU Esb82omlASsPE3fBDoGNbv+bwEF1nGShW//LF8bB7th6+szcM42ve+CHTCkZiyxW6xIw RiscA0ipLw1QYYG8g49lIMia7wCriCNqBBj3YQbedkWcK2dRmReYg9mgO1hpcBvdGHg9 c92oh+QPgcDK/h6IomZhRkE8KYTp0o8RgHPoPsgiw1pAsvrdPA7/9J20mRIm6yBDQMtD UqpZdYoFwV6ylBChwBn/X9O1hqnhwBGbUunsbx4pHGMK0sknDaBSj7+fhpUs/q4b4yVW pP3g== X-Gm-Message-State: ALoCoQm7V/4H+yj3F2d9nini7JUtjP4wBCeRWFzmynNWKBPILJXHTGF0+hPSvkFuAaqxaVx+fhrW X-Received: by 10.42.204.4 with SMTP id fk4mr4235628icb.31.1380237728780; Thu, 26 Sep 2013 16:22:08 -0700 (PDT) Received: from localhost.localdomain (dhcp138.ece.iit.edu. [216.47.144.138]) by mx.google.com with ESMTPSA id yt10sm1006232igb.9.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 26 Sep 2013 16:22:08 -0700 (PDT) From: Spenser Gilliland To: buildroot@busybox.net Date: Thu, 26 Sep 2013 18:21:48 -0500 Message-Id: <1380237714-2470-6-git-send-email-spenser@gillilanding.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1380237714-2470-1-git-send-email-spenser@gillilanding.com> References: <1380237714-2470-1-git-send-email-spenser@gillilanding.com> Subject: [Buildroot] [PATCH v3 05/11] sunxi-cedarx: bump to newer version, use armel2 binaries, add demo X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Spenser Gilliland --- package/sunxi-cedarx/Config.in | 10 ++++++++++ package/sunxi-cedarx/sunxi-cedarx.mk | 27 +++++++++++++++++++++++---- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/package/sunxi-cedarx/Config.in b/package/sunxi-cedarx/Config.in index b280db0..aa520b5 100644 --- a/package/sunxi-cedarx/Config.in +++ b/package/sunxi-cedarx/Config.in @@ -10,5 +10,15 @@ config BR2_PACKAGE_SUNXI_CEDARX http://github.com/linux-sunxi/cedarx-libs http://linux-sunxi.org/CedarX +if BR2_PACKAGE_SUNXI_CEDARX + +config BR2_PACKAGE_SUNXI_CEDARX_DEMO + bool "install enc_dec_test demo" + help + Install a test program which verifies the functionality of the CedarX + libraries + +endif + comment "sunxi-cedarx requires an eglibc/glibc based toolchain" depends on !BR2_TOOLCHAIN_USES_GLIBC && BR2_arm diff --git a/package/sunxi-cedarx/sunxi-cedarx.mk b/package/sunxi-cedarx/sunxi-cedarx.mk index 07c85d4..5e68d7d 100644 --- a/package/sunxi-cedarx/sunxi-cedarx.mk +++ b/package/sunxi-cedarx/sunxi-cedarx.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUNXI_CEDARX_VERSION = 74923e55fc +SUNXI_CEDARX_VERSION = 74c3e9052 SUNXI_CEDARX_SITE = http://github.com/linux-sunxi/cedarx-libs/tarball/$(SUNXI_CEDARX_VERSION) SUNXI_CEDARX_INSTALL_STAGING = YES @@ -14,7 +14,12 @@ SUNXI_CEDARX_CONFIGURE_OPTS = \ ifeq ($(BR2_ARM_EABIHF),y) SUNXI_CEDARX_BIN_DIR = $(@D)/libcedarv/linux-armhf -# libavheap.so is only available on EABIHF +SUNXI_CEDARX_SAMPLE_LOC = $(SUNXI_CEDARX_BIN_DIR)/sample/ve +else +SUNXI_CEDARX_BIN_DIR = $(@D)/libcedarv/linux-armel2 +SUNXI_CEDARX_SAMPLE_LOC = $(SUNXI_CEDARX_BIN_DIR)/sample/output/ve +endif + define SUNXI_CEDARX_BUILD_AVHEAP $(TARGET_CC) $(TARGET_CFLAGS) \ -c $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/avheap.c \ @@ -25,18 +30,31 @@ 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 + +ifeq ($(BR2_PACKAGE_SUNXI_CEDARX_DEMO),y) + +define SUNXI_CEDARX_BUILD_DEMO + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ + -C $(SUNXI_CEDARX_BIN_DIR)/sample $(SUNXI_CEDARX_CONFIGURE_OPTS) +endef + +define SUNXI_CEDARX_INSTALL_DEMO + $(INSTALL) -D -m 755 $(SUNXI_CEDARX_SAMPLE_LOC) \ + $(TARGET_DIR)/usr/bin/ve +endef + endif define SUNXI_CEDARX_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(SUNXI_CEDARX_BIN_DIR) \ $(SUNXI_CEDARX_CONFIGURE_OPTS) $(SUNXI_CEDARX_BUILD_AVHEAP) + $(SUNXI_CEDARX_BUILD_DEMO) endef define SUNXI_CEDARX_INSTALL_STAGING_CMDS @@ -54,6 +72,7 @@ define SUNXI_CEDARX_INSTALL_TARGET_CMDS $(INSTALL) -D -m 755 $(SUNXI_CEDARX_BIN_DIR)/libvecore/libvecore.so \ $(TARGET_DIR)/usr/lib/libvecore.so $(call SUNXI_CEDARX_INSTALL_AVHEAP, $(TARGET_DIR)) + $(SUNXI_CEDARX_INSTALL_DEMO) endef $(eval $(generic-package))