SHA256
1
0
forked from pool/openocd

Accepting request 304041 from home:a_faerber:branches:hardware

Update to v0.9.0-rc1

OBS-URL: https://build.opensuse.org/request/show/304041
OBS-URL: https://build.opensuse.org/package/show/hardware/openocd?expand=0&rev=14
This commit is contained in:
Andreas Färber
2015-04-26 12:05:04 +00:00
committed by Git OBS Bridge
parent ff711b0bea
commit 9fd9a821da
5 changed files with 38 additions and 62 deletions

View File

@@ -1,35 +0,0 @@
Index: openocd-0.7.99+git20140317/src/helper/command.h
===================================================================
--- openocd-0.7.99+git20140317.orig/src/helper/command.h
+++ openocd-0.7.99+git20140317/src/helper/command.h
@@ -168,7 +168,7 @@ struct command {
struct command *parent;
struct command *children;
command_handler_t handler;
- Jim_CmdProc jim_handler;
+ Jim_CmdProc* jim_handler;
void *jim_handler_data;
enum command_mode mode;
struct command *next;
@@ -204,7 +204,7 @@ char *command_name(struct command *c, ch
struct command_registration {
const char *name;
command_handler_t handler;
- Jim_CmdProc jim_handler;
+ Jim_CmdProc* jim_handler;
void *jim_handler_data;
enum command_mode mode;
const char *help;
Index: openocd-0.7.99+git20140317/src/helper/command.c
===================================================================
--- openocd-0.7.99+git20140317.orig/src/helper/command.c
+++ openocd-0.7.99+git20140317/src/helper/command.c
@@ -365,7 +365,7 @@ static int register_command_handler(stru
LOG_DEBUG("registering '%s'...", ocd_name);
- Jim_CmdProc func = c->handler ? &script_command : &command_unknown;
+ Jim_CmdProc* func = c->handler ? &script_command : &command_unknown;
int retval = Jim_CreateCommand(interp, ocd_name, func, c, NULL);
free(ocd_name);
if (JIM_OK != retval)

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5b076c324400ef0198ce6e21616e17f7a1a12f749362821ce0b03ec62c3cd32f
size 3768447

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:48554ea06d731815cae4f27ea0f2a917da351823d9c3b56aa89a0245c85578a3
size 4114607

View File

@@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sat Apr 25 09:24:47 UTC 2015 - afaerber@suse.de
- Update to v0.9.0-rc1
* Drop fix-jim_cmdproc.patch (fixed upstream)
* Drop commented-out use of ./bootstrap script that doesn't exist
- Reorder adapter config options by configure.ac order
* Fix misspelled config option arm-jtag-ew -> armjtagew
- Explicitly enable usb-blaster-2, usbprog
- Explicitly enable parport for x86 and bcm2835gpio for ARM
-------------------------------------------------------------------
Mon Oct 6 08:14:16 UTC 2014 - matwey.kornilov@gmail.com

View File

@@ -1,7 +1,7 @@
#
# spec file for package openocd
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,17 +24,13 @@
%define _udevdir %(pkg-config --variable udevdir udev)
Name: openocd
Version: 0.8.0
Version: 0.9.rc1
Release: 0
Summary: Debugging, in-system programming and boundary-scan testing for embedded devices
License: GPL-2.0
Group: Development/Tools/Debuggers
Url: http://openocd.sourceforge.net/
Source0: %{name}-%{version}.tar.bz2
# PATCH-FIX-OPENSUSE fix-jim_cmdproc.patch matwey.kornilov@gmail.com -- fix for jimtcl 0.75
%if %{external_jimtcl}
Patch0: fix-jim_cmdproc.patch
%endif
Source0: %{name}-0.9.0-rc1.tar.bz2
BuildRequires: autoconf >= 2.64
BuildRequires: automake
BuildRequires: fdupes
@@ -74,15 +70,11 @@ and boundary-scan testing for embedded devices.
This package provides hardware description files and documentation.
%prep
%setup -q
%if %{external_jimtcl}
%patch0 -p1
%endif
%setup -q -n %{name}-0.9.0-rc1
%build
#./bootstrap nosubmodule
%if !%{external_jimtcl}
# set this explicitely, else the configure from included jimtcl
# set this explicitly, else the configure from included jimtcl
# won't find a compiler :(
export CC=gcc
%endif
@@ -94,25 +86,33 @@ export CC=gcc
--enable-static \
--disable-shared \
--disable-doxygen-html \
--enable-sysfsgpio \
--enable-ioutil \
--enable-ftdi \
--enable-gw16012 \
--enable-buspirate \
--enable-stlink \
--enable-ti-icdi \
--enable-amtjtagaccel \
--enable-arm-jtag-ew \
--enable-oocd_trace \
--enable-ulink \
--enable-usb-blaster-2 \
--enable-vsllink \
--enable-jlink \
--enable-osbdm \
--enable-opendous \
--enable-aice \
--enable-remote-bitbang \
--enable-jlink \
--enable-usbprog \
--enable-rlink \
--enable-stlink \
--enable-ulink \
--enable-armjtagew \
--enable-cmsis-dap \
--enable-vsllink
%ifarch %ix86 x86_64
--enable-parport \
%endif
--enable-amtjtagaccel \
%ifarch %arm
--enable-bcm2835gpio \
%endif
--enable-gw16012 \
--enable-oocd_trace \
--enable-buspirate \
--enable-sysfsgpio \
--enable-remote-bitbang \
make %{?_smp_mflags} V=1