Skip to contentSkip to conversation

elfutils: version bump

PATCH New Vicente Olivert Riera 4 participants 8 messages Nov 11, 2014 – Nov 19, 2014

lore
Share & tools
lore
#0 lore raw

v4 cover elfutils: version bump

Changes since v3:
- Keep Thomas' s-o-b in their modified patches
- Add Yann's r-b in the second patch
- Add Yann's a-b in the first patch

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} |   51 ++++++-----
 package/elfutils/0002-argp-support.patch           |   93 ++++++++++++++++++++
 ...s-03-memcpy-def.patch => 0003-memcpy-def.patch} |   14 ++--
 .../{elfutils-04-fts.patch => 0004-fts.patch}      |   68 +++++++--------
 package/elfutils/0005-disable-po.patch             |   24 +++++
 ...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, 213 insertions(+), 184 deletions(-)
 rename package/elfutils/{elfutils-01-disable-progs.patch => 0001-disable-progs.patch} (62%)
 create mode 100644 package/elfutils/0002-argp-support.patch
 rename package/elfutils/{elfutils-03-memcpy-def.patch => 0003-memcpy-def.patch} (62%)
 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
#1 lore raw

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

---
 ...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
#2 lore raw

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

Vicente, All,

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

Quoted 3 lines

I initially only gave my Reviewed-by, but my Acked-by is OK, too.

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.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH v4 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

---
 package/elfutils/0001-disable-progs.patch          |   51 +++++----
 package/elfutils/0002-argp-support.patch           |  119 ++++++++++----------
 package/elfutils/0003-memcpy-def.patch             |   14 ++-
 package/elfutils/0004-fts.patch                    |   68 ++++++------
 package/elfutils/0005-disable-po.patch             |   24 ++--
 ...y-make-werror-conditional-to-build-werror.patch |   24 ++++
 package/elfutils/elfutils.hash                     |    3 +
 package/elfutils/elfutils.mk                       |    6 +-
 8 files changed, 169 insertions(+), 140 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 +26 -25
index 462de89..8772f5e 100644
@@ -7,35 +7,18 @@ 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).
 
+Based on the former patch by Thomas Petazzoni.
+
 Signed-off-by: Thomas Petazzoni <[email protected]>
+Signed-off-by: Vicente Olivert Riera <[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 @@
+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 +28,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 -59

143 lines not on this page · raw message

package/elfutils/0003-memcpy-def.patch +8 -6
index eb50cf6..5094827 100644
@@ -4,21 +4,23 @@ 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.
 
+Based on the former patch by Thomas Petazzoni.
+
 Signed-off-by: Thomas Petazzoni <[email protected]>
+Signed-off-by: Vicente Olivert Riera <[email protected]>
 
-Index: b/libelf/libelf.h
-===================================================================
---- a/libelf/libelf.h
-+++ b/libelf/libelf.h
+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 -35

102 lines not on this page · raw message

package/elfutils/0005-disable-po.patch +13 -11
index d98da0b..c45c580 100644
@@ -5,18 +5,20 @@ 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.
 
+Based on the former patch by Thomas Petazzoni.
+
 Signed-off-by: Thomas Petazzoni <[email protected]>
+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
#4 lore raw

PATCH v4 2/2 elfutils: bump version to 0.160

package/elfutils/elfutils.hash line 3

Quoted 2 lines · Vicente Olivert Riera
package/elfutils/elfutils.hash new file +2 -0
+sha256  741b556863c069ceab2d81eb54aeda8c34f46728859704eaf9baef8503e9a9d1  elfutils-0.160.tar.bz2
+sha256  feb307acf472598ea7af4e4b439251613a8f5d81e804b4abf9aeca195a5d4254  elfutils-portability.patch

Forgot to mention in my previous review: I verified the first hash against the
upstream gpg signature, and I verified the second hash against my local download.

I also did a simple build test. So:

Regards,
Arnout

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
#5 lore raw

PATCH v4 2/2 elfutils: bump version to 0.160

Arnout, Vicente, All,

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

Quoted 7 lines · Vicente Olivert Riera

package/elfutils/elfutils.hash line 3

Quoted 2 lines
package/elfutils/elfutils.hash new file +2 -0
+sha256  741b556863c069ceab2d81eb54aeda8c34f46728859704eaf9baef8503e9a9d1  elfutils-0.160.tar.bz2
+sha256  feb307acf472598ea7af4e4b439251613a8f5d81e804b4abf9aeca195a5d4254  elfutils-portability.patch

Forgot to mention in my previous review: I verified the first hash against the
upstream gpg signature, and I verified the second hash against my local download.

Quoted 5 lines

I also did a simple build test. So:

Vicente noticed I replied to the v3, not this v4, so I'll repeat it here, in case my explanations went un-noticed:

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, I still believe the patch title is correct, except upstream may have messed up their conditional test (and we could help them fix it, maybe).

So my reviewed-by tag, which this patch already bears, still stands.

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.  |
'------------------------------^-------^------------------^--------------------'
#6 lore raw

PATCH v4 2/2 elfutils: bump version to 0.160

Quoted 16 lines · Yann E. MORIN

Arnout, Vicente, All,

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

Quoted 7 lines · Vicente Olivert Riera

package/elfutils/elfutils.hash line 3

Quoted 2 lines
package/elfutils/elfutils.hash new file +2 -0
+sha256  741b556863c069ceab2d81eb54aeda8c34f46728859704eaf9baef8503e9a9d1  elfutils-0.160.tar.bz2
+sha256  feb307acf472598ea7af4e4b439251613a8f5d81e804b4abf9aeca195a5d4254  elfutils-portability.patch

Forgot to mention in my previous review: I verified the first hash against the
upstream gpg signature, and I verified the second hash against my local download.

Quoted 5 lines

I also did a simple build test. So:

Quoted 8 lines

Vicente noticed I replied to the v3, not this v4, so I'll repeat it here, in case my explanations went un-noticed:

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

Weird, I grepped for it and found no matches...

Oooh, now I understand: the BUILD_WERROR is added by elfutils-portability.patch
and I did my checks before applying patches.

OK, so this means an unconditional:

Regards,
Arnout

Quoted 19 lines

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, I still believe the patch title is correct, except upstream may have messed up their conditional test (and we could help them fix it, maybe).

So my reviewed-by tag, which this patch already bears, still stands.

Regards,
Yann E. MORIN.

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
#7 lore raw

v4 cover elfutils: version bump

In reply to Vicente Olivert Riera

Dear Vicente Olivert Riera,

Quoted 8 lines · Vicente Olivert Riera

Changes since v3:
- Keep Thomas' s-o-b in their modified patches
- Add Yann's r-b in the second patch
- Add Yann's a-b in the first patch

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

Series applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com