aboutsummaryrefslogtreecommitdiff
path: root/package/ne10
diff options
context:
space:
mode:
authorGravatar Clayton Shotwell <clayton.shotwell@rockwellcollins.com>2015-03-11 12:15:34 -0500
committerGravatar Peter Korsgaard <peter@korsgaard.com>2015-03-11 22:08:24 +0100
commit8cdf680799d7055a272190387064f87c7c638906 (patch)
tree3cfab69947bbbf0dcd38c58b6e11e417d9a18811 /package/ne10
parent7b99794de12618a0849ce7a9674405fafa9b4ce1 (diff)
downloadbuildroot-8cdf680799d7055a272190387064f87c7c638906.tar.gz
buildroot-8cdf680799d7055a272190387064f87c7c638906.tar.bz2
ne10: bump to version 1.2.0
Bump to version 1.2.0, fixup patch, and add ensure package is installed to the staging directory. [Peter: keep Baruch's authorship on patch] Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/ne10')
-rw-r--r--package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch24
-rw-r--r--package/ne10/ne10.mk3
2 files changed, 15 insertions, 12 deletions
diff --git a/package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch b/package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch
index 3402b5ae6b..f140a60441 100644
--- a/package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch
+++ b/package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch
@@ -1,27 +1,29 @@
-From 00995e0b8a66fbd0eabd206188120bfc1ecdac59 Mon Sep 17 00:00:00 2001
-Message-Id: <00995e0b8a66fbd0eabd206188120bfc1ecdac59.1398245232.git.baruch@tkos.co.il>
+From 9ff39800cec5f1dabba246b253794582d611bc6d Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
-Date: Wed, 23 Apr 2014 12:21:37 +0300
+Date: Fri, 20 Feb 2015 10:44:15 -0600
Subject: [PATCH] CMakeLists: don't hard code thumb code generation
+Migrating to version 1.2.0
+
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2c7f8d62a42b..cec614fba041 100644
+index fdf01ec..34ae26e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -77,7 +77,7 @@ if(ANDROID_PLATFORM)
- add_subdirectory(android/NE10Demo/jni)
- endif()
+@@ -84,7 +84,7 @@ if(ANDROID_PLATFORM)
+ ${ANDROID_TOOLCHAIN_PATH}/arm-linux-androideabi-ar
+ ${ANDROID_TOOLCHAIN_PATH}/arm-linux-androideabi-ranlib")
elseif(GNULINUX_PLATFORM)
-- set(CMAKE_C_FLAGS "-O2 -mthumb-interwork -mthumb -march=armv7-a -mfpu=vfp3")
-+ set(CMAKE_C_FLAGS "-O2 -mthumb-interwork -march=armv7-a -mfpu=vfp3")
- set(CMAKE_ASM_FLAGS "-mthumb-interwork -mthumb -march=armv7-a -mfpu=neon")
+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=vfp3")
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -march=armv7-a -mfpu=vfp3")
+ set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=neon")
elseif(IOS_PLATFORM)
#set minimal target ios version.If not provided this option, Xcode
--
-1.9.2
+1.9.1
diff --git a/package/ne10/ne10.mk b/package/ne10/ne10.mk
index b1897c855a..aeaa0413b5 100644
--- a/package/ne10/ne10.mk
+++ b/package/ne10/ne10.mk
@@ -4,10 +4,11 @@
#
################################################################################
-NE10_VERSION = v1.0.0
+NE10_VERSION = v1.2.0
NE10_SITE = $(call github,projectNe10,Ne10,$(NE10_VERSION))
NE10_LICENSE = BSD-3c or Apache-2.0
NE10_LICENSE_FILES = doc/LICENSE
+NE10_INSTALL_STAGING = YES
NE10_CONF_OPTS = -DGNULINUX_PLATFORM=ON