[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-239-g37a915c
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-239-g37a915c
|
From: Julien B a. A. <ar...@us...> - 2014-04-28 14:14:41
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 37a915c3ea610f154512436300d3620af8c04578 (commit)
from bfa516708940b73797c0d3a3c381b3900cc54d50 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 37a915c3ea610f154512436300d3620af8c04578
Author: Julien Boibessot <jul...@ar...>
Date: Mon Apr 28 16:07:11 2014 +0200
[BUILDROOT] Add xc3sprog package
-----------------------------------------------------------------------
Summary of changes:
.../009-armadeus-xc3sprog-new-package.patch | 89 ++++++++++++++++++++
patches/buildroot/2013.11/cleanup_buildroot.sh | 1 +
2 files changed, 90 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2013.11/009-armadeus-xc3sprog-new-package.patch
diff --git a/patches/buildroot/2013.11/009-armadeus-xc3sprog-new-package.patch b/patches/buildroot/2013.11/009-armadeus-xc3sprog-new-package.patch
new file mode 100644
index 0000000..92f8bf1
--- /dev/null
+++ b/patches/buildroot/2013.11/009-armadeus-xc3sprog-new-package.patch
@@ -0,0 +1,89 @@
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2014-04-25 15:23:28.394854759 +0200
++++ buildroot/package/Config.in 2014-04-25 15:24:07.743049855 +0200
+@@ -369,6 +369,7 @@
+ source "package/usbutils/Config.in"
+ source "package/wipe/Config.in"
+ source "package/w_scan/Config.in"
++source "package/xc3sprog/Config.in"
+ endmenu
+
+ menu "Interpreter languages and scripting"
+Index: buildroot/package/xc3sprog/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/xc3sprog/Config.in 2014-04-28 11:53:32.522265102 +0200
+@@ -0,0 +1,13 @@
++config BR2_PACKAGE_XC3SPROG
++ bool "xc3sprog"
++ depends on BR2_INSTALL_LIBSTDCPP
++ depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi
++ select BR2_PACKAGE_LIBFTDI
++ help
++ xc3sprog is a suite of utilities for programming Xilinx FPGAs, CPLDs,
++ and EEPROMs with the Xilinx Parallel Cable and other JTAG adapters.
++
++ http://xc3sprog.sourceforge.net/
++
++comment "xc3sprog needs a toolchain w/ C++, threads"
++ depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
+Index: buildroot/package/xc3sprog/xc3sprog.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/xc3sprog/xc3sprog.mk 2014-04-28 12:41:29.448531008 +0200
+@@ -0,0 +1,19 @@
++################################################################################
++#
++# xc3sprog
++#
++################################################################################
++
++XC3SPROG_VERSION = 760
++XC3SPROG_SITE = https://svn.code.sf.net/p/xc3sprog/code/trunk
++XC3SPROG_SITE_METHOD = svn
++X3CSPROG_LICENSE = GPLv2+
++X3CSPROG_LICENSE_FILES = COPYING
++X3CSPROG_DEPENDENCIES = libftdi
++
++XC3SPROG_CONF_OPT += \
++ -DVERSION_STRING=0.0-svn$(XC3SPROG_VERSION) \
++ -DCMAKE_EXE_LINKER_FLAGS=-lpthread
++
++$(eval $(cmake-package))
++$(eval $(host-cmake-package))
+Index: buildroot/package/xc3sprog/xc3sprog-fixes-version-detection.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/xc3sprog/xc3sprog-fixes-version-detection.patch 2014-04-28 12:37:02.587207718 +0200
+@@ -0,0 +1,30 @@
++Do not launch 'svn info' if sources directory is not a svn checkout.
++This prevents cmake to fail at configuration stage when building package in BR.
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++--- xc3sprog-760.org/CMakeLists.txt 2013-12-09 16:42:37.000000000 +0100
+++++ xc3sprog-760/CMakeLists.txt 2014-04-28 11:45:20.899827274 +0200
++@@ -35,13 +35,15 @@
++ if(EXISTS ${PROJECT_SOURCE_DIR}/.git)
++ set(VERSION_STRING "${xc3sprog_VERSION_MAJOR}.${xc3sprog_VERSION_MINOR}-git")
++ else(EXISTS ${PROJECT_SOURCE_DIR}/.git)
++- FIND_PACKAGE(Subversion)
++- IF(Subversion_FOUND)
++- Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Project)
++- set(VERSION_STRING "${xc3sprog_VERSION_MAJOR}.${xc3sprog_VERSION_MINOR}-svn${Project_WC_REVISION}")
++- ELSE(Subversion_FOUND)
++- set(VERSION_STRING "unknown")
++- ENDIF(Subversion_FOUND)
+++ IF(EXISTS ${PROJECT_SOURCE_DIR}/.svn)
+++ FIND_PACKAGE(Subversion)
+++ IF(Subversion_FOUND)
+++ Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Project)
+++ set(VERSION_STRING "${xc3sprog_VERSION_MAJOR}.${xc3sprog_VERSION_MINOR}-svn${Project_WC_REVISION}")
+++ ELSE(Subversion_FOUND)
+++ set(VERSION_STRING "unknown")
+++ ENDIF(Subversion_FOUND)
+++ ENDIF(EXISTS ${PROJECT_SOURCE_DIR}/.svn)
++ endif(EXISTS ${PROJECT_SOURCE_DIR}/.git)
++
++ # Create suffix to eventually install inlib64
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index 70352f8..6816363 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -85,3 +85,4 @@ rm -rf buildroot/package/uclibc/0.9.33.2/uclibc-0056-assume-accept4-in-recent-ar
rm -rf buildroot/package/owfs/
rm -rf buildroot/package/agg/
rm -rf buildroot/package/gnash/
+rm -rf buildroot/package/xc3sprog/
hooks/post-receive
--
armadeus
|
