elfutils: version bump
v2 cover elfutils: version bump
Changes since v1:
- Don't use one single patch to rename patches and adapt them to the new version. Now it's done in two separated patches. Thanks to Yann E. Morin for the advice.
- Don't use a hook to remove the -Werror options. Instead of that, modify the config/eu.am to make the --disable-werror configure option do its job properly. Thanks to Yann E. Moring for the patch.
Vicente Olivert Riera (4):
elfutils: rename patches to follow the new name structure
elfutils: bump version to 0.160
elfutils: adapt patches to the new version
elfutils: really make -Werror conditional to BUILD_WERROR
...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 | 16 ++++
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, 204 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.hashPATCH v2 1/4 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
package/elfutils/0002-argp-support.patch renamed from package/elfutils/elfutils-02-argp-support.patch +0 -0
package/elfutils/0003-memcpy-def.patch renamed from package/elfutils/elfutils-03-memcpy-def.patch +0 -0
package/elfutils/0004-fts.patch renamed from package/elfutils/elfutils-04-fts.patch +0 -0
package/elfutils/0005-disable-po.patch renamed from package/elfutils/elfutils-05-disable-po.patch +0 -0
Signature · 1 line
1.7.1
PATCH v2 2/4 elfutils: bump version to 0.160
In reply to Vicente Olivert Riera- Bump version to 0.160
- Add a hash file
--- package/elfutils/elfutils.hash | 3 +++ package/elfutils/elfutils.mk | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 package/elfutils/elfutils.hash
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
package/elfutils/elfutils.mk +2 -4
@@ -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
PATCH v2 3/4 elfutils: adapt patches to the new version
In reply to Vicente Olivert Riera--- 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 +++--- 5 files changed, 141 insertions(+), 142 deletions(-)
package/elfutils/0001-disable-progs.patch +27 -27
@@ -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
@@ -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
@@ -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
Signature · 1 line
1.7.1
PATCH v2 3/4 elfutils: adapt patches to the new version
Dear Vicente Olivert Riera,
Quoted 8 lines · Vicente Olivert Riera
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 +++--- 5 files changed, 141 insertions(+), 142 deletions(-)
You still don't seem to understand what "bisectability" means. It means that your series should *work* at each point of the series.
Here, if we apply patches 1 and 2 of your series, but leave patches 3 and 4 unapplied, the build will break, because patch 2 has changed the version of elfutils being used, but changes of patch 3 are not present, so the patches of elfutils will not apply.
Do the test yourself: apply just your patches 1 and 2, and test the build of elfutils.
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v2 4/4 elfutils: really make -Werror conditional to BUILD_WERROR
In reply to Vicente Olivert RieraApply a patch written by Yann E. Morin to really make -Werror conditional to BUILD_WERROR. Otherwise it will fail with a 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
--- ...y-make-werror-conditional-to-build-werror.patch | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) create mode 100644 package/elfutils/0006-really-make-werror-conditional-to-build-werror.patch
package/elfutils/0006-really-make-werror-conditional-to-build-werror.patch new file +16 -0
@@ -0,0 +1,16 @@ +Really make -Werror conditional to BUILD_WERROR + +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)
Signature · 1 line
1.7.1
PATCH v2 4/4 elfutils: really make -Werror conditional to BUILD_WERROR
I have reported this issue upstream:
https://lists.fedorahosted.org/pipermail/elfutils-devel/2014-November/004258.html
v2 cover elfutils: version bump
In reply to Vicente Olivert RieraVicente, All,
On 2014-11-10 16:38 +0000, Vicente Olivert Riera spake thusly:
Quoted 8 lines
Changes since v1:
- Don't use one single patch to rename patches and adapt them to the new version. Now it's done in two separated patches. Thanks to Yann E. Morin for the advice.
- Don't use a hook to remove the -Werror options. Instead of that, modify the config/eu.am to make the --disable-werror configure option do its job properly. Thanks to Yann E. Moring for the patch.
Quoted 5 lines
Vicente Olivert Riera (4):
elfutils: rename patches to follow the new name structure
elfutils: bump version to 0.160
elfutils: adapt patches to the new version
elfutils: really make -Werror conditional toBUILD_WERROR
As I said in my previous review, you need to fold patches 2, 3 and 4 into a single patch.
When you bump a version, you should do it as a whole:
- bump the version
- update the patches
- add new patches
all in the same changeset, so that it is always possible to build at each step, after each patch.
It is posible to split (like you did) to ease review, but then state so in the cover letter.
Regards,
Yann E. MORIN.
Quoted 25 lines
...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 | 16 ++++ 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, 204 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_______________________________________________
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. | '------------------------------^-------^------------------^--------------------'