* SUBJECT HERE *

PATCH Superseded Vicente Olivert Riera 3 participants 8 messages Nov 11, 2014

Share & tools

Vicente Olivert Riera

author

2014-11-11 11:00 UTC #0 lore raw

v3 cover *** SUBJECT HERE ***

Changes since v2:
- Join patches 2, 3 and 4 in a single patch, so all the patch series works at each point of the series.

Vicente Olivert Riera (2):
elfutils: rename patches to follow the new name structure
elfutils: bump version to 0.160

 ...isable-progs.patch => 0001-disable-progs.patch} |   54 ++++++------
 package/elfutils/0002-argp-support.patch           |   92 ++++++++++++++++++++
 ...s-03-memcpy-def.patch => 0003-memcpy-def.patch} |   15 ++--
 .../{elfutils-04-fts.patch => 0004-fts.patch}      |   69 +++++++--------
 package/elfutils/0005-disable-po.patch             |   23 +++++
 ...y-make-werror-conditional-to-build-werror.patch |   24 +++++
 package/elfutils/elfutils-02-argp-support.patch    |   92 --------------------
 package/elfutils/elfutils-05-disable-po.patch      |   22 -----
 package/elfutils/elfutils.hash                     |    3 +
 package/elfutils/elfutils.mk                       |    6 +-
 10 files changed, 212 insertions(+), 188 deletions(-)
 rename package/elfutils/{elfutils-01-disable-progs.patch => 0001-disable-progs.patch} (60%)
 create mode 100644 package/elfutils/0002-argp-support.patch
 rename package/elfutils/{elfutils-03-memcpy-def.patch => 0003-memcpy-def.patch} (58%)
 rename package/elfutils/{elfutils-04-fts.patch => 0004-fts.patch} (97%)
 create mode 100644 package/elfutils/0005-disable-po.patch
 create mode 100644 package/elfutils/0006-really-make-werror-conditional-to-build-werror.patch
 delete mode 100644 package/elfutils/elfutils-02-argp-support.patch
 delete mode 100644 package/elfutils/elfutils-05-disable-po.patch
 create mode 100644 package/elfutils/elfutils.hash

Vicente Olivert Riera

author

2014-11-11 11:00 UTC #1 lore raw

PATCH v3 1/2 elfutils: rename patches to follow the new name structure

Signed-off-by Vicente Olivert Riera <[email protected]>

---
 ...isable-progs.patch => 0001-disable-progs.patch} |    0
 ...-argp-support.patch => 0002-argp-support.patch} |    0
 ...s-03-memcpy-def.patch => 0003-memcpy-def.patch} |    0
 .../{elfutils-04-fts.patch => 0004-fts.patch}      |    0
 ...s-05-disable-po.patch => 0005-disable-po.patch} |    0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename package/elfutils/{elfutils-01-disable-progs.patch => 0001-disable-progs.patch} (100%)
 rename package/elfutils/{elfutils-02-argp-support.patch => 0002-argp-support.patch} (100%)
 rename package/elfutils/{elfutils-03-memcpy-def.patch => 0003-memcpy-def.patch} (100%)
 rename package/elfutils/{elfutils-04-fts.patch => 0004-fts.patch} (100%)
 rename package/elfutils/{elfutils-05-disable-po.patch => 0005-disable-po.patch} (100%)

package/elfutils/0001-disable-progs.patch renamed from package/elfutils/elfutils-01-disable-progs.patch +0 -0

similarity index 100%
rename from package/elfutils/elfutils-01-disable-progs.patch
rename to package/elfutils/0001-disable-progs.patch

package/elfutils/0002-argp-support.patch renamed from package/elfutils/elfutils-02-argp-support.patch +0 -0

similarity index 100%
rename from package/elfutils/elfutils-02-argp-support.patch
rename to package/elfutils/0002-argp-support.patch

package/elfutils/0003-memcpy-def.patch renamed from package/elfutils/elfutils-03-memcpy-def.patch +0 -0

similarity index 100%
rename from package/elfutils/elfutils-03-memcpy-def.patch
rename to package/elfutils/0003-memcpy-def.patch

package/elfutils/0004-fts.patch renamed from package/elfutils/elfutils-04-fts.patch +0 -0

similarity index 100%
rename from package/elfutils/elfutils-04-fts.patch
rename to package/elfutils/0004-fts.patch

package/elfutils/0005-disable-po.patch renamed from package/elfutils/elfutils-05-disable-po.patch +0 -0

similarity index 100%
rename from package/elfutils/elfutils-05-disable-po.patch
rename to package/elfutils/0005-disable-po.patch

Signature · 1 line

1.7.1

Yann E. MORIN

2014-11-11 11:21 UTC #2 lore raw

PATCH v3 1/2 elfutils: rename patches to follow the new name structure

Vicente, All,

On 2014-11-11 11:00 +0000, Vicente Olivert Riera spake thusly:

Quoted 1 line

Signed-off-by Vicente Olivert Riera <[email protected]>

Reviewed-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 40 lines

---
 ...isable-progs.patch => 0001-disable-progs.patch} |    0
 ...-argp-support.patch => 0002-argp-support.patch} |    0
 ...s-03-memcpy-def.patch => 0003-memcpy-def.patch} |    0
 .../{elfutils-04-fts.patch => 0004-fts.patch}      |    0
 ...s-05-disable-po.patch => 0005-disable-po.patch} |    0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename package/elfutils/{elfutils-01-disable-progs.patch => 0001-disable-progs.patch} (100%)
 rename package/elfutils/{elfutils-02-argp-support.patch => 0002-argp-support.patch} (100%)
 rename package/elfutils/{elfutils-03-memcpy-def.patch => 0003-memcpy-def.patch} (100%)
 rename package/elfutils/{elfutils-04-fts.patch => 0004-fts.patch} (100%)
 rename package/elfutils/{elfutils-05-disable-po.patch => 0005-disable-po.patch} (100%)

package/elfutils/0001-disable-progs.patch renamed from package/elfutils/elfutils-01-disable-progs.patch +0 -0

similarity index 100%
rename from package/elfutils/elfutils-01-disable-progs.patch
rename to package/elfutils/0001-disable-progs.patch

package/elfutils/0002-argp-support.patch renamed from package/elfutils/elfutils-02-argp-support.patch +0 -0

similarity index 100%
rename from package/elfutils/elfutils-02-argp-support.patch
rename to package/elfutils/0002-argp-support.patch

package/elfutils/0003-memcpy-def.patch renamed from package/elfutils/elfutils-03-memcpy-def.patch +0 -0

similarity index 100%
rename from package/elfutils/elfutils-03-memcpy-def.patch
rename to package/elfutils/0003-memcpy-def.patch

package/elfutils/0004-fts.patch renamed from package/elfutils/elfutils-04-fts.patch +0 -0

similarity index 100%
rename from package/elfutils/elfutils-04-fts.patch
rename to package/elfutils/0004-fts.patch

package/elfutils/0005-disable-po.patch renamed from package/elfutils/elfutils-05-disable-po.patch +0 -0

similarity index 100%
rename from package/elfutils/elfutils-05-disable-po.patch
rename to package/elfutils/0005-disable-po.patch

Signature · 6 lines

1.7.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Vicente Olivert Riera

author

2014-11-11 11:00 UTC #3 lore raw

PATCH v3 2/2 elfutils: bump version to 0.160

In reply to Vicente Olivert Riera

- Bump version to 0.160
- Add a hash file
- Adapt patches to the new version
- Add a new patch to really make -Werror conditional to BUILD_WERROR

Signed-off-by Vicente Olivert Riera <[email protected]>

---
 package/elfutils/0001-disable-progs.patch          |   54 +++++-----
 package/elfutils/0002-argp-support.patch           |  120 ++++++++++----------
 package/elfutils/0003-memcpy-def.patch             |   15 ++-
 package/elfutils/0004-fts.patch                    |   69 ++++++------
 package/elfutils/0005-disable-po.patch             |   25 ++--
 ...y-make-werror-conditional-to-build-werror.patch |   24 ++++
 package/elfutils/elfutils.hash                     |    3 +
 package/elfutils/elfutils.mk                       |    6 +-
 8 files changed, 170 insertions(+), 146 deletions(-)
 create mode 100644 package/elfutils/0006-really-make-werror-conditional-to-build-werror.patch
 create mode 100644 package/elfutils/elfutils.hash

package/elfutils/0001-disable-progs.patch +27 ~~-27~~

index 462de89..b66252d 100644
@@ -7,35 +7,17 @@ useful because the programs are often not needed, and also because
 building the programs against uClibc causes several issues (lack of
 obstack_printf() in uClibc for example).
 
-Signed-off-by: Thomas Petazzoni <[email protected]>
-
-Index: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -22,9 +22,13 @@
- 
- pkginclude_HEADERS = version.h
- 
-+if ENABLE_PROGS
-+PROGS_SUBDIR = src
-+endif
-+
- # Add doc back when we have some real content.
- SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \
--	  src po tests
-+	  $(PROGS_SUBDIR) po tests
- 
- EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
- 	     COPYING COPYING-GPLV2 COPYING-LGPLV3
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -263,6 +263,12 @@
+Based on the former patch by Thomas Petazzoni.
+
+Signed-off-by: Vicente Olivert Riera <[email protected]>
+
+diff -rup a/configure.ac b/configure.ac
+--- a/configure.ac	2014-11-07 14:54:32.859360779 +0000
++++ b/configure.ac	2014-11-07 14:47:44.847376394 +0000
+@@ -253,6 +253,12 @@ AC_SUBST([LIBEBL_SUBDIR])
  AC_DEFINE_UNQUOTED(LIBEBL_SUBDIR, "$LIBEBL_SUBDIR")
  AH_TEMPLATE([LIBEBL_SUBDIR], [$libdir subdirectory containing libebl modules.])
- 
+
 +AC_ARG_ENABLE([progs],
 +	AS_HELP_STRING([--enable-progs], [enable progs]),
 +	enable_progs=$enableval,

@@ -45,3 +27,21 @@ Index: b/configure.ac
  dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am
  dnl conditional and config.h USE_ZLIB/USE_BZLIB #define.
  save_LIBS="$LIBS"
+diff -rup a/Makefile.am b/Makefile.am
+--- a/Makefile.am	2014-08-27 10:25:17.000000000 +0100
++++ b/Makefile.am	2014-11-07 14:51:38.081368550 +0000
+@@ -22,9 +22,13 @@ ACLOCAL_AMFLAGS = -I m4
+
+ pkginclude_HEADERS = version.h
+
++if ENABLE_PROGS
++PROGS_SUBDIR = src
++endif
++
+ # Add doc back when we have some real content.
+ SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \
+-	  backends src po tests
++	  backends $(PROGS_SUBDIR) po tests
+
+ EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
+	     COPYING COPYING-GPLV2 COPYING-LGPLV3

package/elfutils/0002-argp-support.patch +60 ~~-60~~

143 lines not on this page · raw message

package/elfutils/0003-memcpy-def.patch +8 -7

index eb50cf6..ce28003 100644
@@ -4,21 +4,22 @@ For some reason, libelf uses the internal glibc alias __memcpy, which
 doesn't exist in uClibc. Add a manual alias so that the build can
 proceed with uClibc.
 
-Signed-off-by: Thomas Petazzoni <[email protected]>
+Based on the former patch by Thomas Petazzoni.
 
-Index: b/libelf/libelf.h
-===================================================================
---- a/libelf/libelf.h
-+++ b/libelf/libelf.h
+Signed-off-by: Vicente Olivert Riera <[email protected]>
+
+diff -rup a/libelf/libelf.h b/libelf/libelf.h
+--- a/libelf/libelf.h	2014-08-27 10:25:17.000000000 +0100
++++ b/libelf/libelf.h	2014-11-07 15:13:08.743508221 +0000
 @@ -34,6 +34,11 @@
  /* Get the ELF types.  */
  #include <elf.h>
- 
+
 +#ifndef _LIBC
 +#ifndef __mempcpy
 +#define __mempcpy mempcpy
 +#endif
 +#endif
- 
+
  /* Known translation types.  */
  typedef enum

package/elfutils/0004-fts.patch +33 ~~-36~~

102 lines not on this page · raw message

package/elfutils/0005-disable-po.patch +13 ~~-12~~

index d98da0b..638dc0d 100644
@@ -5,18 +5,19 @@ been generated with gettext 0.17, while we use gettext 0.18 in
 Buildroot. Since we don't care that much about po files anyway, just
 disable the build of this directory.
 
-Signed-off-by: Thomas Petazzoni <[email protected]>
+Based on the former patch by Thomas Petazzoni.
+
+Signed-off-by: Vicente Olivert Riera <[email protected]>
+
+diff -rup a/Makefile.am b/Makefile.am
+--- a/Makefile.am	2014-11-07 15:14:39.018060884 +0000
++++ b/Makefile.am	2014-11-07 15:30:02.864918229 +0000
+@@ -28,7 +28,7 @@ endif
 
-Index: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -28,7 +28,7 @@
- 
  # Add doc back when we have some real content.
- SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \
--	  $(PROGS_SUBDIR) po tests
-+	  $(PROGS_SUBDIR) tests
- 
+ SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \
+-	  backends $(PROGS_SUBDIR) po tests
++	  backends $(PROGS_SUBDIR) tests
+
  EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
- 	     COPYING COPYING-GPLV2 COPYING-LGPLV3
+	     COPYING COPYING-GPLV2 COPYING-LGPLV3

package/elfutils/0006-really-make-werror-conditional-to-build-werror.patch new file +24 -0

new file mode 100644
index 0000000..59aae5e
@@ -0,0 +1,24 @@
+Really make -Werror conditional to BUILD_WERROR
+
+Otherwise it will fail with an error message like this one:
+
+elf_getarsym.c:290:9: error: 'n' may be used uninitialized in this
+function [-Werror=maybe-uninitialized]
+    arsym[n].as_name = NULL;
+	 ^
+cc1: all warnings being treated as errors
+
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+Signed-off-by: Vicente Olivert Riera <[email protected]>
+
+diff -rup a/config/eu.am b/config/eu.am
+--- a/config/eu.am	2014-11-10 16:19:14.356031479 +0000
++++ b/config/eu.am	2014-11-10 16:21:11.702072011 +0000
+@@ -35,7 +35,6 @@ LD_AS_NEEDED = @LD_AS_NEEDED@
+ DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"'
+ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
+ AM_CFLAGS = -std=gnu99 -Wall -Wshadow \
+-	    $(if $($(*F)_no_Werror),,-Werror) \
+ 	    $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
+ 	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \
+ 	    $($(*F)_CFLAGS)

package/elfutils/elfutils.hash new file +3 -0

new file mode 100644
index 0000000..f0f4598
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256  741b556863c069ceab2d81eb54aeda8c34f46728859704eaf9baef8503e9a9d1  elfutils-0.160.tar.bz2
+sha256  feb307acf472598ea7af4e4b439251613a8f5d81e804b4abf9aeca195a5d4254  elfutils-portability.patch

package/elfutils/elfutils.mk +2 -4

index 4f00a27..4914b3b 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ELFUTILS_VERSION = 0.155
+ELFUTILS_VERSION = 0.160
 ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2
 ELFUTILS_SITE = https://fedorahosted.org/releases/e/l/elfutils/$(ELFUTILS_VERSION)
 ELFUTILS_LICENSE = GPLv3 GPLv2 LGPLv3

@@ -13,9 +13,7 @@ ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3
 # The tarball does not have a generated configure script
 ELFUTILS_AUTORECONF = YES
 ELFUTILS_CONF_OPTS += --disable-werror
-ELFUTILS_PATCH = \
-	elfutils-portability.patch \
-	elfutils-robustify.patch
+ELFUTILS_PATCH = elfutils-portability.patch
 
 ELFUTILS_INSTALL_STAGING = YES

Signature · 1 line

1.7.1

Yann E. MORIN

2014-11-11 11:32 UTC #4 lore raw

PATCH v3 2/2 elfutils: bump version to 0.160

Vicente, All,

On 2014-11-11 11:00 +0000, Vicente Olivert Riera spake thusly:

Quoted 44 lines

- Bump version to 0.160
- Add a hash file
- Adapt patches to the new version
- Add a new patch to really make -Werror conditional to BUILD_WERROR

Signed-off-by Vicente Olivert Riera <[email protected]>

---
 package/elfutils/0001-disable-progs.patch          |   54 +++++-----
 package/elfutils/0002-argp-support.patch           |  120 ++++++++++----------
 package/elfutils/0003-memcpy-def.patch             |   15 ++-
 package/elfutils/0004-fts.patch                    |   69 ++++++------
 package/elfutils/0005-disable-po.patch             |   25 ++--
 ...y-make-werror-conditional-to-build-werror.patch |   24 ++++
 package/elfutils/elfutils.hash                     |    3 +
 package/elfutils/elfutils.mk                       |    6 +-
 8 files changed, 170 insertions(+), 146 deletions(-)
 create mode 100644 package/elfutils/0006-really-make-werror-conditional-to-build-werror.patch
 create mode 100644 package/elfutils/elfutils.hash

package/elfutils/0001-disable-progs.patch +0 ~~-17~~

index 462de89..b66252d 100644
@@ -7,35 +7,17 @@ useful because the programs are often not needed, and also because
 building the programs against uClibc causes several issues (lack of
 obstack_printf() in uClibc for example).
 
-Signed-off-by: Thomas Petazzoni <[email protected]>
-
-Index: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -22,9 +22,13 @@
- 
- pkginclude_HEADERS = version.h
- 
-+if ENABLE_PROGS
-+PROGS_SUBDIR = src
-+endif
-+
- # Add doc back when we have some real content.
- SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \
--	  src po tests

package/elfutils/0001-disable-progs.patch useful because the programs are often not needed, and also because · line 10

Quoted 10 lines

package/elfutils/0001-disable-progs.patch +1 -9

-+	  $(PROGS_SUBDIR) po tests
- 
- EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
- 	     COPYING COPYING-GPLV2 COPYING-LGPLV3
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -263,6 +263,12 @@
+Based on the former patch by Thomas Petazzoni.

Since you based that patch on Thomas' previous patch (and this is in fact just a refresh), you should keep his SoB-line. The SoB-line is here to represent the chain in which the patch was handled, so it is very important to keep them.

Ditto for the other patches.

package/elfutils/elfutils.hash line 3

Quoted 9 lines

package/elfutils/elfutils.hash new file +3 -0

new file mode 100644
index 0000000..f0f4598
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256  741b556863c069ceab2d81eb54aeda8c34f46728859704eaf9baef8503e9a9d1  elfutils-0.160.tar.bz2
+sha256  feb307acf472598ea7af4e4b439251613a8f5d81e804b4abf9aeca195a5d4254  elfutils-portability.patch

Both hashes validated with: make elfutils-source

Looks good. With the SoB lines fixed, you can add my:

    Reviewed-by: "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Signature · 13 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20141111/df033f38/attachment.asc>

Arnout Vandecappelle

2014-11-11 11:48 UTC #5 lore raw

PATCH v3 2/2 elfutils: bump version to 0.160

In reply to Vicente Olivert Riera

Quoted 6 lines · Vicente Olivert Riera

- Bump version to 0.160
- Add a hash file
- Adapt patches to the new version
- Add a new patch to really make -Werror conditional to BUILD_WERROR
Signed-off-by Vicente Olivert Riera <[email protected]>

[snip]

package/elfutils/0006-really-make-werror-conditional-to-build-werror.patch line 1

Quoted 7 lines

package/elfutils/0006-really-make-werror-conditional-to-build-werror.patch new file +1 -0
new file mode 100644
index 0000000..59aae5e
@@ -0,0 +1,24 @@
+Really make -Werror conditional to BUILD_WERROR

This subject is wrong, since it's not conditional on BUILD_WERROR (and
BUILD_WERROR isn't even defined by the configure script). So it should just be "Remove -Werror from build" or something similar.

I've looked for an easy way to make this upstreamable, but it doesn't look trivial.

Quoted 29 lines

package/elfutils/0006-really-make-werror-conditional-to-build-werror.patch new file +23 -0

+
+Otherwise it will fail with an error message like this one:
+
+elf_getarsym.c:290:9: error: 'n' may be used uninitialized in this
+function [-Werror=maybe-uninitialized]
+    arsym[n].as_name = NULL;
+	 ^
+cc1: all warnings being treated as errors
+
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+Signed-off-by: Vicente Olivert Riera <[email protected]>
+
+diff -rup a/config/eu.am b/config/eu.am
+--- a/config/eu.am	2014-11-10 16:19:14.356031479 +0000
++++ b/config/eu.am	2014-11-10 16:21:11.702072011 +0000
+@@ -35,7 +35,6 @@ LD_AS_NEEDED = @LD_AS_NEEDED@
+ DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"'
+ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
+ AM_CFLAGS = -std=gnu99 -Wall -Wshadow \
+-	    $(if $($(*F)_no_Werror),,-Werror) \
+ 	    $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
+ 	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \
+ 	    $($(*F)_CFLAGS)

package/elfutils/elfutils.hash new file +0 -0

new file mode 100644
index 0000000..f0f4598

package/elfutils/elfutils.hash line 3

Quoted 3 lines

package/elfutils/elfutils.hash new file +3 -0

@@ -0,0 +1,3 @@
+# Locally calculated
+sha256  741b556863c069ceab2d81eb54aeda8c34f46728859704eaf9baef8503e9a9d1  elfutils-0.160.tar.bz2
+sha256  feb307acf472598ea7af4e4b439251613a8f5d81e804b4abf9aeca195a5d4254  elfutils-portability.patch

This one triggers an interesting bug in our download infrastructure. The
elfutils-portability.patch file has the same name as in the previous version, but it has a different hash (of course). So when building with a pre-populated download directory, it will fail the first time.

The ideal solution would be if we would force the version number into all
downloaded files. But since we have the hashes now, a much simpler solution (at least conceptually, could be tricky to implement) would be to retry the download once if the hash check has failed. Or alternatively, check the hash before _and_ after the download.

Regards,
Arnout

Quoted 25 lines

package/elfutils/elfutils.mk +2 -4

index 4f00a27..4914b3b 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ELFUTILS_VERSION = 0.155
+ELFUTILS_VERSION = 0.160
 ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2
 ELFUTILS_SITE = https://fedorahosted.org/releases/e/l/elfutils/$(ELFUTILS_VERSION)
 ELFUTILS_LICENSE = GPLv3 GPLv2 LGPLv3

@@ -13,9 +13,7 @@ ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3
 # The tarball does not have a generated configure script
 ELFUTILS_AUTORECONF = YES
 ELFUTILS_CONF_OPTS += --disable-werror
-ELFUTILS_PATCH = \
-	elfutils-portability.patch \
-	elfutils-robustify.patch
+ELFUTILS_PATCH = elfutils-portability.patch
 
 ELFUTILS_INSTALL_STAGING = YES

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

Yann E. MORIN

2014-11-11 15:48 UTC #6 lore raw

PATCH v3 2/2 elfutils: bump version to 0.160

Arnout, Vicente, All,

On 2014-11-11 12:48 +0100, Arnout Vandecappelle spake thusly:

Quoted 10 lines · Vicente Olivert Riera

Quoted 6 lines
- Bump version to 0.160
- Add a hash file
- Adapt patches to the new version
- Add a new patch to really make -Werror conditional to BUILD_WERROR
Signed-off-by Vicente Olivert Riera <[email protected]>
[snip]

Quoted 11 lines

package/elfutils/0006-really-make-werror-conditional-to-build-werror.patch line 1
Quoted 7 lines
package/elfutils/0006-really-make-werror-conditional-to-build-werror.patch new file +1 -0
new file mode 100644
index 0000000..59aae5e
@@ -0,0 +1,24 @@
+Really make -Werror conditional to BUILD_WERROR
This subject is wrong, since it's not conditional on BUILD_WERROR (and
BUILD_WERROR isn't even defined by the configure script). So it should just be "Remove -Werror from build" or something similar.

Well, if you look a few lines further in config/eu.am you'll see:

    if BUILD_WERROR
    AM_CFLAGS += $(if $($(*F)_no_Werror),,-Werror)
    endif

So, this patch remove the duplicate setting of -Werror in the place where it is not wanted, because it is already conditional to BUILD_WERROR, even though it should be BUILD_WERROR_TRUE that should be tested.

But the real automake conditional is really called BUILD_WERROR:

./configure.ac:AM_CONDITIONAL(BUILD_WERROR, test "$enable_werror" = yes)

So, IU still believe the patch title is correct, except upstream messed up their conditional test.

Regards,
Yann E. MORIN.

Quoted 6 lines

Quoted 6 lines
package/elfutils/elfutils.hash new file +0 -0
new file mode 100644
index 0000000..f0f4598
@@ -0,0 +1,3 @@

Quoted 8 lines

package/elfutils/elfutils.hash line 3
Quoted 3 lines
package/elfutils/elfutils.hash new file +3 -0
+# Locally calculated
+sha256  741b556863c069ceab2d81eb54aeda8c34f46728859704eaf9baef8503e9a9d1  elfutils-0.160.tar.bz2
+sha256  feb307acf472598ea7af4e4b439251613a8f5d81e804b4abf9aeca195a5d4254  elfutils-portability.patch
This one triggers an interesting bug in our download infrastructure. The
elfutils-portability.patch file has the same name as in the previous version, but it has a different hash (of course). So when building with a pre-populated download directory, it will fail the first time.

Yup, it failed for me the first time, and I really wondered what hapenned... I fired the download again, and that time it worked...

Quoted 5 lines

The ideal solution would be if we would force the version number into all
downloaded files. But since we have the hashes now, a much simpler solution (at least conceptually, could be tricky to implement) would be to retry the download once if the hash check has failed. Or alternatively, check the hash before _and_ after the download.

Yes, befiore the download, we check if the hashes match (if already present, of course). If not, we remove the file, but do not fail, so we can download.

After the download, we re-check the hash. If it does not match, we remove the file, and fail as done today.

Thoughts?

Regards,
Yann E. MORIN.

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Vicente Olivert Riera

author

2014-11-11 11:13 UTC #7 lore raw

v3 cover elfutils: version bump

In reply to Vicente Olivert Riera

Quoted 20 lines · Vicente Olivert Riera

Changes since v2:
- Join patches 2, 3 and 4 in a single patch, so all the patch series works at each point of the series.

Vicente Olivert Riera (2):
elfutils: rename patches to follow the new name structure
elfutils: bump version to 0.160

 ...isable-progs.patch => 0001-disable-progs.patch} |   54 ++++++------
 package/elfutils/0002-argp-support.patch           |   92 ++++++++++++++++++++
 ...s-03-memcpy-def.patch => 0003-memcpy-def.patch} |   15 ++--
 .../{elfutils-04-fts.patch => 0004-fts.patch}      |   69 +++++++--------
 package/elfutils/0005-disable-po.patch             |   23 +++++
 ...y-make-werror-conditional-to-build-werror.patch |   24 +++++
 package/elfutils/elfutils-02-argp-support.patch    |   92 --------------------
 package/elfutils/elfutils-05-disable-po.patch      |   22 -----
 package/elfutils/elfutils.hash                     |    3 +
 package/elfutils/elfutils.mk                       |    6 +-
 10 files changed, 212 insertions(+), 188 deletions(-)
 rename package/elfutils/{elfutils-01-disable-progs.patch => 0001-disable-progs.patch} (60%)

Quoted 9 lines

 create mode 100644 package/elfutils/0002-argp-support.patch
 rename package/elfutils/{elfutils-03-memcpy-def.patch => 0003-memcpy-def.patch} (58%)
 rename package/elfutils/{elfutils-04-fts.patch => 0004-fts.patch} (97%)
 create mode 100644 package/elfutils/0005-disable-po.patch
 create mode 100644 package/elfutils/0006-really-make-werror-conditional-to-build-werror.patch
 delete mode 100644 package/elfutils/elfutils-02-argp-support.patch
 delete mode 100644 package/elfutils/elfutils-05-disable-po.patch
 create mode 100644 package/elfutils/elfutils.hash

Sorry about the *** SUBJECT HERE *** subject :-(

Signature · 5 lines

Vicente Olivert Riera
Graduate Software Engineer, MIPS Processor IP
Imagination Technologies Limited
t: +44 (0)113 2429814
www.imgtec.com