diff mbox

openocd: bump to 0.9.0

Message ID 1448959942-22748-1-git-send-email-yegorslists@googlemail.com
State Accepted
Headers show

Commit Message

Yegor Yefremov Dec. 1, 2015, 8:52 a.m. UTC
From: Yegor Yefremov <yegorslists@googlemail.com>

Remove obsolete compilation error patch and update jimtcl related patch.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
 ...mpilation-error-in-src-flash-nor-mini51.c.patch | 30 ----------------------
 ...auto-configuration-to-force-static-librar.patch | 14 +++-------
 package/openocd/openocd.hash                       |  6 ++---
 package/openocd/openocd.mk                         |  4 +--
 4 files changed, 8 insertions(+), 46 deletions(-)
 delete mode 100644 package/openocd/0001-Fix-compilation-error-in-src-flash-nor-mini51.c.patch

Comments

Baruch Siach Dec. 1, 2015, 9:58 a.m. UTC | #1
Hi Yegor,

On Tue, Dec 01, 2015 at 09:52:22AM +0100, yegorslists@googlemail.com wrote:
> From: Yegor Yefremov <yegorslists@googlemail.com>
> 
> Remove obsolete compilation error patch and update jimtcl related patch.

[...]

> -OPENOCD_VERSION = 0.8.0
> +OPENOCD_VERSION = 0.9.0
>  OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2
> -OPENOCD_SITE = http://downloads.sourceforge.net/project/openocd/openocd/$(OPENOCD_VERSION)
> +OPENOCD_SITE = http://sourceforge.net/projects/openocd/files/openocd/$(OPENOCD_VERSION)
>  
>  OPENOCD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99"

Is this still needed?

baruch
Yegor Yefremov Dec. 1, 2015, 10:33 a.m. UTC | #2
On Tue, Dec 1, 2015 at 10:58 AM, Baruch Siach <baruch@tkos.co.il> wrote:
> Hi Yegor,
>
> On Tue, Dec 01, 2015 at 09:52:22AM +0100, yegorslists@googlemail.com wrote:
>> From: Yegor Yefremov <yegorslists@googlemail.com>
>>
>> Remove obsolete compilation error patch and update jimtcl related patch.
>
> [...]
>
>> -OPENOCD_VERSION = 0.8.0
>> +OPENOCD_VERSION = 0.9.0
>>  OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2
>> -OPENOCD_SITE = http://downloads.sourceforge.net/project/openocd/openocd/$(OPENOCD_VERSION)
>> +OPENOCD_SITE = http://sourceforge.net/projects/openocd/files/openocd/$(OPENOCD_VERSION)
>>
>>  OPENOCD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
>
> Is this still needed?

Commit message states: Pass -std=gnu99, needed to build with a basic toolchain.

I've commented this like and could successfully compile with musl +
gcc 4.9.3 and also with Linaro ARM 2015.08 (GCC 5.x).

@Thomas and @Claudio: any idea, what configuration produced compiling issues?

Yegor
Thomas Petazzoni Dec. 1, 2015, 10:56 a.m. UTC | #3
Dear Yegor Yefremov,

On Tue, 1 Dec 2015 11:33:25 +0100, Yegor Yefremov wrote:

> Commit message states: Pass -std=gnu99, needed to build with a basic toolchain.
> 
> I've commented this like and could successfully compile with musl +
> gcc 4.9.3 and also with Linaro ARM 2015.08 (GCC 5.x).
> 
> @Thomas and @Claudio: any idea, what configuration produced compiling issues?

Can you try with
http://autobuild.buildroot.org/toolchains/configs/br-arm-basic.config ?
This is what I call a "basic" toolchain, i.e a minimal uClibc toolchain
with no wchar and al. enabled.

Thanks,

Thomas
Yegor Yefremov Dec. 1, 2015, 11:25 a.m. UTC | #4
On Tue, Dec 1, 2015 at 11:56 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Dear Yegor Yefremov,
>
> On Tue, 1 Dec 2015 11:33:25 +0100, Yegor Yefremov wrote:
>
>> Commit message states: Pass -std=gnu99, needed to build with a basic toolchain.
>>
>> I've commented this like and could successfully compile with musl +
>> gcc 4.9.3 and also with Linaro ARM 2015.08 (GCC 5.x).
>>
>> @Thomas and @Claudio: any idea, what configuration produced compiling issues?
>
> Can you try with
> http://autobuild.buildroot.org/toolchains/configs/br-arm-basic.config ?
> This is what I call a "basic" toolchain, i.e a minimal uClibc toolchain
> with no wchar and al. enabled.

Compilation *fails* without gnu99 with basic toolchain.

Yegor
Baruch Siach Dec. 1, 2015, 12:20 p.m. UTC | #5
Hi Yegor,

On Tue, Dec 01, 2015 at 12:25:46PM +0100, Yegor Yefremov wrote:
> On Tue, Dec 1, 2015 at 11:56 AM, Thomas Petazzoni
> <thomas.petazzoni@free-electrons.com> wrote:
> > On Tue, 1 Dec 2015 11:33:25 +0100, Yegor Yefremov wrote:
> >
> >> Commit message states: Pass -std=gnu99, needed to build with a basic toolchain.
> >>
> >> I've commented this like and could successfully compile with musl +
> >> gcc 4.9.3 and also with Linaro ARM 2015.08 (GCC 5.x).
> >>
> >> @Thomas and @Claudio: any idea, what configuration produced compiling issues?
> >
> > Can you try with
> > http://autobuild.buildroot.org/toolchains/configs/br-arm-basic.config ?
> > This is what I call a "basic" toolchain, i.e a minimal uClibc toolchain
> > with no wchar and al. enabled.
> 
> Compilation *fails* without gnu99 with basic toolchain.

Just curious, do you have any idea why the build fails, and how -std=gnu99 
fixes the problem?

baruch
Yegor Yefremov Dec. 1, 2015, 1:29 p.m. UTC | #6
On Tue, Dec 1, 2015 at 1:20 PM, Baruch Siach <baruch@tkos.co.il> wrote:
> Hi Yegor,
>
> On Tue, Dec 01, 2015 at 12:25:46PM +0100, Yegor Yefremov wrote:
>> On Tue, Dec 1, 2015 at 11:56 AM, Thomas Petazzoni
>> <thomas.petazzoni@free-electrons.com> wrote:
>> > On Tue, 1 Dec 2015 11:33:25 +0100, Yegor Yefremov wrote:
>> >
>> >> Commit message states: Pass -std=gnu99, needed to build with a basic toolchain.
>> >>
>> >> I've commented this like and could successfully compile with musl +
>> >> gcc 4.9.3 and also with Linaro ARM 2015.08 (GCC 5.x).
>> >>
>> >> @Thomas and @Claudio: any idea, what configuration produced compiling issues?
>> >
>> > Can you try with
>> > http://autobuild.buildroot.org/toolchains/configs/br-arm-basic.config ?
>> > This is what I call a "basic" toolchain, i.e a minimal uClibc toolchain
>> > with no wchar and al. enabled.
>>
>> Compilation *fails* without gnu99 with basic toolchain.
>
> Just curious, do you have any idea why the build fails, and how -std=gnu99
> fixes the problem?

The error occurs because openocd uses some C99 constructs, like this
one for example:

../../../src/helper/binarybuffer.h:53:3: error: 'for' loop initial
declarations are only allowed in C99 or C11 mode
   for (unsigned i = first; i < first + num; i++) {

Yegor
Yegor Yefremov Dec. 1, 2015, 1:56 p.m. UTC | #7
On Tue, Dec 1, 2015 at 2:29 PM, Yegor Yefremov
<yegorslists@googlemail.com> wrote:
> On Tue, Dec 1, 2015 at 1:20 PM, Baruch Siach <baruch@tkos.co.il> wrote:
>> Hi Yegor,
>>
>> On Tue, Dec 01, 2015 at 12:25:46PM +0100, Yegor Yefremov wrote:
>>> On Tue, Dec 1, 2015 at 11:56 AM, Thomas Petazzoni
>>> <thomas.petazzoni@free-electrons.com> wrote:
>>> > On Tue, 1 Dec 2015 11:33:25 +0100, Yegor Yefremov wrote:
>>> >
>>> >> Commit message states: Pass -std=gnu99, needed to build with a basic toolchain.
>>> >>
>>> >> I've commented this like and could successfully compile with musl +
>>> >> gcc 4.9.3 and also with Linaro ARM 2015.08 (GCC 5.x).
>>> >>
>>> >> @Thomas and @Claudio: any idea, what configuration produced compiling issues?
>>> >
>>> > Can you try with
>>> > http://autobuild.buildroot.org/toolchains/configs/br-arm-basic.config ?
>>> > This is what I call a "basic" toolchain, i.e a minimal uClibc toolchain
>>> > with no wchar and al. enabled.
>>>
>>> Compilation *fails* without gnu99 with basic toolchain.
>>
>> Just curious, do you have any idea why the build fails, and how -std=gnu99
>> fixes the problem?
>
> The error occurs because openocd uses some C99 constructs, like this
> one for example:
>
> ../../../src/helper/binarybuffer.h:53:3: error: 'for' loop initial
> declarations are only allowed in C99 or C11 mode
>    for (unsigned i = first; i < first + num; i++) {

I've added AC_PROG_CC_STDC to configure.ac. When running on my host directly:

checking for gcc option to accept ISO C99... -std=gnu99
checking for gcc -std=gnu99 option to accept ISO C99... (cached) -std=gnu99
checking for gcc -std=gnu99 -std=gnu99 option to accept ISO Standard
C... (cached) -std=gnu99

When running BR (OPENOCD_OVERRIDE_SRCDIR) with basic toolchain:

checking for buildroot/testing/host/usr/bin/arm-linux-gcc option to
accept ISO C99... unsupported
checking for buildroot/testing/host/usr/bin/arm-linux-gcc option to
accept ISO C99... (cached) unsupported
checking for buildroot/testing/host/usr/bin/arm-linux-gcc option to
accept ISO C89... (cached) none needed
checking for buildroot/testing/host/usr/bin/arm-linux-gcc option to
accept ISO Standard C... (cached) none needed
Thomas Petazzoni Dec. 1, 2015, 4:43 p.m. UTC | #8
Dear yegorslists@googlemail.com,

On Tue,  1 Dec 2015 09:52:22 +0100, yegorslists@googlemail.com wrote:
> From: Yegor Yefremov <yegorslists@googlemail.com>
> 
> Remove obsolete compilation error patch and update jimtcl related patch.
> 
> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
> ---
>  ...mpilation-error-in-src-flash-nor-mini51.c.patch | 30 ----------------------
>  ...auto-configuration-to-force-static-librar.patch | 14 +++-------
>  package/openocd/openocd.hash                       |  6 ++---
>  package/openocd/openocd.mk                         |  4 +--
>  4 files changed, 8 insertions(+), 46 deletions(-)
>  delete mode 100644 package/openocd/0001-Fix-compilation-error-in-src-flash-nor-mini51.c.patch

Applied to next (soon to be master), thanks.

Thomas
diff mbox

Patch

diff --git a/package/openocd/0001-Fix-compilation-error-in-src-flash-nor-mini51.c.patch b/package/openocd/0001-Fix-compilation-error-in-src-flash-nor-mini51.c.patch
deleted file mode 100644
index 6eb7f9d..0000000
--- a/package/openocd/0001-Fix-compilation-error-in-src-flash-nor-mini51.c.patch
+++ /dev/null
@@ -1,30 +0,0 @@ 
-From 893330638a26ea2868c6e7606047acf9b6fe31ea Mon Sep 17 00:00:00 2001
-From: Claudio Laurita <claudio.laurita@integrazionetotale.it>
-Date: Sun, 30 Nov 2014 17:30:36 +0100
-Subject: [PATCH 1/1] Fix compilation error in src/flash/nor/mini51.c
-
-0001-Fix-compilation-error-in-src-flash-nor-mini51.c.patch
-gcc complains about missing initialization of 
-local variable flash_size and compilation aborts
-
-Signed-off-by: Claudio Laurita <claudio.laurita@integrazionetotale.it>
----
- src/flash/nor/mini51.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/flash/nor/mini51.c b/src/flash/nor/mini51.c
-index 61aee5d..c7ba13a 100644
---- a/src/flash/nor/mini51.c
-+++ b/src/flash/nor/mini51.c
-@@ -397,7 +397,7 @@ static int mini51_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t
- 
- static int mini51_probe(struct flash_bank *bank)
- {
--	uint32_t flash_size;
-+	uint32_t flash_size = 0;
- 	int retval;
- 	int num_pages;
- 	uint32_t offset = 0;
--- 
-2.1.3
-
diff --git a/package/openocd/0002-Fix-jimtcl-auto-configuration-to-force-static-librar.patch b/package/openocd/0002-Fix-jimtcl-auto-configuration-to-force-static-librar.patch
index 5ec0552..fd3cfa4 100644
--- a/package/openocd/0002-Fix-jimtcl-auto-configuration-to-force-static-librar.patch
+++ b/package/openocd/0002-Fix-jimtcl-auto-configuration-to-force-static-librar.patch
@@ -7,15 +7,10 @@  Subject: [PATCH 2/2] Fix jimtcl auto configuration to force static library
  option in buildroot project.
 
 Signed-off-by: Claudio Laurita <claudio.laurita@integrazionetotale.it>
----
- jimtcl/auto.def | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
 
-diff --git a/jimtcl/auto.def b/jimtcl/auto.def
-index ddb0c1e..929ade0 100644
 --- a/jimtcl/auto.def
 +++ b/jimtcl/auto.def
-@@ -181,12 +181,8 @@ if {[opt-bool references]} {
+@@ -194,12 +194,8 @@
      msg-result "Enabling references"
      define JIM_REFERENCES
  }
@@ -27,9 +22,6 @@  index ddb0c1e..929ade0 100644
 -}
 +msg-result "Building static library"
 +define JIM_STATICLIB
+ define LIBSOEXT [format [get-define SH_SOEXTVER] [format %.2f [expr {[get-define JIM_VERSION] / 100.0}]]]
  define JIM_INSTALL [opt-bool install-jim]
- 
- # Attributes of the extensions
--- 
-2.1.3
-
+ define JIM_DOCS [opt-bool docs]
diff --git a/package/openocd/openocd.hash b/package/openocd/openocd.hash
index bc5c8c0..4ca11e2 100644
--- a/package/openocd/openocd.hash
+++ b/package/openocd/openocd.hash
@@ -1,3 +1,3 @@ 
-# From http://sourceforge.net/projects/openocd/files/openocd/0.8.0/
-sha1 10bf9eeb54e03083cb1a101785b2d69fbdf18f31 openocd-0.8.0.tar.bz2
-md5 6d83c34763a5f1d1ac7ad83c5a11f4fb openocd-0.8.0.tar.bz2
+# From http://sourceforge.net/projects/openocd/files/openocd/0.9.0/
+sha1 bcf99bb21f09513065b2c9ece148ace7d16cdd0c openocd-0.9.0.tar.bz2
+md5 665cc98ae9e7297e09ec6ac7235fee49 openocd-0.9.0.tar.bz2
diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
index 3b76850..21a302f 100644
--- a/package/openocd/openocd.mk
+++ b/package/openocd/openocd.mk
@@ -4,9 +4,9 @@ 
 #
 ################################################################################
 
-OPENOCD_VERSION = 0.8.0
+OPENOCD_VERSION = 0.9.0
 OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2
-OPENOCD_SITE = http://downloads.sourceforge.net/project/openocd/openocd/$(OPENOCD_VERSION)
+OPENOCD_SITE = http://sourceforge.net/projects/openocd/files/openocd/$(OPENOCD_VERSION)
 
 OPENOCD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99"