diff mbox

[1/2] elfutils: bump version to 0.160

Message ID 1415616323-58155-1-git-send-email-Vincent.Riera@imgtec.com
State Superseded
Headers show

Commit Message

Vicente Olivert Riera Nov. 10, 2014, 10:45 a.m. UTC 
- Bump version to 0.160
- Add a hash file
- Add a hook to remove some -Werror options

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 package/elfutils/elfutils.hash |    3 +++
 package/elfutils/elfutils.mk   |   16 ++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 package/elfutils/elfutils.hash

Comments

Samuel Martin Nov. 10, 2014, 12:31 p.m. UTC | #1 
Hi Vicente,

On Mon, Nov 10, 2014 at 11:45 AM, Vicente Olivert Riera
<Vincent.Riera@imgtec.com> wrote:
> - Bump version to 0.160
> - Add a hash file
> - Add a hook to remove some -Werror options
>
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
>  package/elfutils/elfutils.hash |    3 +++
>  package/elfutils/elfutils.mk   |   16 ++++++++++++----
>  2 files changed, 15 insertions(+), 4 deletions(-)
>  create mode 100644 package/elfutils/elfutils.hash
>
> diff --git a/package/elfutils/elfutils.hash b/package/elfutils/elfutils.hash
> new file mode 100644
> index 0000000..f0f4598
> --- /dev/null
> +++ b/package/elfutils/elfutils.hash
> @@ -0,0 +1,3 @@
> +# Locally calculated
> +sha256  741b556863c069ceab2d81eb54aeda8c34f46728859704eaf9baef8503e9a9d1  elfutils-0.160.tar.bz2
> +sha256  feb307acf472598ea7af4e4b439251613a8f5d81e804b4abf9aeca195a5d4254  elfutils-portability.patch
> diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk
> index 4f00a27..e8ff3fc 100644
> --- a/package/elfutils/elfutils.mk
> +++ b/package/elfutils/elfutils.mk
> @@ -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
>
> @@ -68,4 +66,14 @@ else
>  ELFUTILS_CONF_OPTS += --disable-progs
>  endif
>
> +# The --disable-werror configure option does not seem to be enough. We
> +# need to remove the -Werror options from these Makefiles in order to
> +# avoid compilation failures.
> +define ELFUTILS_DISABLE_WERROR
> +       $(SED) 's/-Werror//g' $(@D)/lib/Makefile
> +       $(SED) 's/-Werror//g' $(@D)/libelf/Makefile
> +       $(SED) 's/-Werror//g' $(@D)/libdwfl/Makefile
> +endef
> +ELFUTILS_POST_CONFIGURE_HOOKS += ELFUTILS_DISABLE_WERROR

Since we are already reconfiguring elfutils, is it possible to patch
the Makefile.am or Makefile.in instead?
Also if you manage to fix the --disable-werror option, it'd be good to
send the fix upstream.

Regards,
Vicente Olivert Riera Nov. 10, 2014, 1:17 p.m. UTC | #2 
Dear Samuel Martin,

On 11/10/2014 12:31 PM, Samuel Martin wrote:
> Hi Vicente,
> 
> On Mon, Nov 10, 2014 at 11:45 AM, Vicente Olivert Riera
> <Vincent.Riera@imgtec.com> wrote:
>> - Bump version to 0.160
>> - Add a hash file
>> - Add a hook to remove some -Werror options
>>
>> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
>> ---
>>  package/elfutils/elfutils.hash |    3 +++
>>  package/elfutils/elfutils.mk   |   16 ++++++++++++----
>>  2 files changed, 15 insertions(+), 4 deletions(-)
>>  create mode 100644 package/elfutils/elfutils.hash
>>
>> diff --git a/package/elfutils/elfutils.hash b/package/elfutils/elfutils.hash
>> new file mode 100644
>> index 0000000..f0f4598
>> --- /dev/null
>> +++ b/package/elfutils/elfutils.hash
>> @@ -0,0 +1,3 @@
>> +# Locally calculated
>> +sha256  741b556863c069ceab2d81eb54aeda8c34f46728859704eaf9baef8503e9a9d1  elfutils-0.160.tar.bz2
>> +sha256  feb307acf472598ea7af4e4b439251613a8f5d81e804b4abf9aeca195a5d4254  elfutils-portability.patch
>> diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk
>> index 4f00a27..e8ff3fc 100644
>> --- a/package/elfutils/elfutils.mk
>> +++ b/package/elfutils/elfutils.mk
>> @@ -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
>>
>> @@ -68,4 +66,14 @@ else
>>  ELFUTILS_CONF_OPTS += --disable-progs
>>  endif
>>
>> +# The --disable-werror configure option does not seem to be enough. We
>> +# need to remove the -Werror options from these Makefiles in order to
>> +# avoid compilation failures.
>> +define ELFUTILS_DISABLE_WERROR
>> +       $(SED) 's/-Werror//g' $(@D)/lib/Makefile
>> +       $(SED) 's/-Werror//g' $(@D)/libelf/Makefile
>> +       $(SED) 's/-Werror//g' $(@D)/libdwfl/Makefile
>> +endef
>> +ELFUTILS_POST_CONFIGURE_HOOKS += ELFUTILS_DISABLE_WERROR
> 
> Since we are already reconfiguring elfutils, is it possible to patch
> the Makefile.am or Makefile.in instead?

I tried it but I couldn't get rid of that by just modifying the
Makefile.{am,in}, that's why I ended with that solution. If you can try
it I would be very appreciated.

> Also if you manage to fix the --disable-werror option, it'd be good to
> send the fix upstream.

I agree.

Cheers,
Yann E. MORIN Nov. 10, 2014, 3:19 p.m. UTC | #3 
Vicente, Samuel, All,

On 2014-11-10 13:17 +0000, Vicente Olivert Riera spake thusly:
> On 11/10/2014 12:31 PM, Samuel Martin wrote:
> > On Mon, Nov 10, 2014 at 11:45 AM, Vicente Olivert Riera
> > <Vincent.Riera@imgtec.com> wrote:
> >> - Bump version to 0.160
> >> - Add a hash file
> >> - Add a hook to remove some -Werror options
> >>
> >> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
[--SNIP--]
> >> +# The --disable-werror configure option does not seem to be enough. We
> >> +# need to remove the -Werror options from these Makefiles in order to
> >> +# avoid compilation failures.
> >> +define ELFUTILS_DISABLE_WERROR
> >> +       $(SED) 's/-Werror//g' $(@D)/lib/Makefile
> >> +       $(SED) 's/-Werror//g' $(@D)/libelf/Makefile
> >> +       $(SED) 's/-Werror//g' $(@D)/libdwfl/Makefile
> >> +endef
> >> +ELFUTILS_POST_CONFIGURE_HOOKS += ELFUTILS_DISABLE_WERROR
> > 
> > Since we are already reconfiguring elfutils, is it possible to patch
> > the Makefile.am or Makefile.in instead?
> 
> I tried it but I couldn't get rid of that by just modifying the
> Makefile.{am,in}, that's why I ended with that solution. If you can try
> it I would be very appreciated.

I managed to get it build without the hook, using that patch:

    infra: really make -Werror condiftional to BUILD_WERROR
    
    Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

    diff -durN elfutils-0.160.orig/config/eu.am elfutils-0.160/config/eu.am
    --- elfutils-0.160.orig/config/eu.am2014-11-10 16:15:26.644739769 +0100
    ++  + elfutils-0.160/config/eu.am2014-11-10 16:15:52.745052929 +0100
    @@ -3   5,7 +35,6 @@
     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),,-We   rror) \
            $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
            $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \
            $($(*F)_CFLAGS)

Regards,
Yann E. MORIN.
Vicente Olivert Riera Nov. 10, 2014, 3:26 p.m. UTC | #4 
Dear Yann E. MORIN,

On 11/10/2014 03:19 PM, Yann E. MORIN wrote:
> Vicente, Samuel, All,
> 
> On 2014-11-10 13:17 +0000, Vicente Olivert Riera spake thusly:
>> On 11/10/2014 12:31 PM, Samuel Martin wrote:
>>> On Mon, Nov 10, 2014 at 11:45 AM, Vicente Olivert Riera
>>> <Vincent.Riera@imgtec.com> wrote:
>>>> - Bump version to 0.160
>>>> - Add a hash file
>>>> - Add a hook to remove some -Werror options
>>>>
>>>> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> [--SNIP--]
>>>> +# The --disable-werror configure option does not seem to be enough. We
>>>> +# need to remove the -Werror options from these Makefiles in order to
>>>> +# avoid compilation failures.
>>>> +define ELFUTILS_DISABLE_WERROR
>>>> +       $(SED) 's/-Werror//g' $(@D)/lib/Makefile
>>>> +       $(SED) 's/-Werror//g' $(@D)/libelf/Makefile
>>>> +       $(SED) 's/-Werror//g' $(@D)/libdwfl/Makefile
>>>> +endef
>>>> +ELFUTILS_POST_CONFIGURE_HOOKS += ELFUTILS_DISABLE_WERROR
>>>
>>> Since we are already reconfiguring elfutils, is it possible to patch
>>> the Makefile.am or Makefile.in instead?
>>
>> I tried it but I couldn't get rid of that by just modifying the
>> Makefile.{am,in}, that's why I ended with that solution. If you can try
>> it I would be very appreciated.
> 
> I managed to get it build without the hook, using that patch:
> 
>     infra: really make -Werror condiftional to BUILD_WERROR
>     
>     Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> 
>     diff -durN elfutils-0.160.orig/config/eu.am elfutils-0.160/config/eu.am
>     --- elfutils-0.160.orig/config/eu.am2014-11-10 16:15:26.644739769 +0100
>     ++  + elfutils-0.160/config/eu.am2014-11-10 16:15:52.745052929 +0100
>     @@ -3   5,7 +35,6 @@
>      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),,-We   rror) \
>             $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
>             $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \
>             $($(*F)_CFLAGS)
> 
> Regards,
> Yann E. MORIN.
> 

I will test it and re-spin a new version of the two patches, also taking
into account your comments about the 2/2 patch :-)

Thanks!
Yann E. MORIN Nov. 10, 2014, 3:29 p.m. UTC | #5 
Vicente, All,

On 2014-11-10 16:19 +0100, Yann E. MORIN spake thusly:
> Vicente, Samuel, All,
> 
> On 2014-11-10 13:17 +0000, Vicente Olivert Riera spake thusly:
> > On 11/10/2014 12:31 PM, Samuel Martin wrote:
> > > On Mon, Nov 10, 2014 at 11:45 AM, Vicente Olivert Riera
> > > <Vincent.Riera@imgtec.com> wrote:
> > >> - Bump version to 0.160
> > >> - Add a hash file
> > >> - Add a hook to remove some -Werror options
> > >>
> > >> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> [--SNIP--]
> > >> +# The --disable-werror configure option does not seem to be enough. We
> > >> +# need to remove the -Werror options from these Makefiles in order to
> > >> +# avoid compilation failures.
> > >> +define ELFUTILS_DISABLE_WERROR
> > >> +       $(SED) 's/-Werror//g' $(@D)/lib/Makefile
> > >> +       $(SED) 's/-Werror//g' $(@D)/libelf/Makefile
> > >> +       $(SED) 's/-Werror//g' $(@D)/libdwfl/Makefile
> > >> +endef
> > >> +ELFUTILS_POST_CONFIGURE_HOOKS += ELFUTILS_DISABLE_WERROR
> > > 
> > > Since we are already reconfiguring elfutils, is it possible to patch
> > > the Makefile.am or Makefile.in instead?
> > 
> > I tried it but I couldn't get rid of that by just modifying the
> > Makefile.{am,in}, that's why I ended with that solution. If you can try
> > it I would be very appreciated.
> 
> I managed to get it build without the hook, using that patch:
> 
>     infra: really make -Werror condiftional to BUILD_WERROR
>     
>     Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> 
>     diff -durN elfutils-0.160.orig/config/eu.am elfutils-0.160/config/eu.am
>     --- elfutils-0.160.orig/config/eu.am2014-11-10 16:15:26.644739769 +0100
>     ++  + elfutils-0.160/config/eu.am2014-11-10 16:15:52.745052929 +0100
>     @@ -3   5,7 +35,6 @@
>      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),,-We   rror) \
>             $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
>             $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \
>             $($(*F)_CFLAGS)

Dang.. The patch was mangled somehow...

To make it clear what I did: I removed line 38 from config/eu.am

You can re-use my patch description and sob when you submit your v2.
Feel free to update as you see fit. ;-)

Regards,
Yann E. MORIN.
diff mbox

Patch

diff --git a/package/elfutils/elfutils.hash b/package/elfutils/elfutils.hash
new file mode 100644
index 0000000..f0f4598
--- /dev/null
+++ b/package/elfutils/elfutils.hash
@@ -0,0 +1,3 @@ 
+# Locally calculated
+sha256  741b556863c069ceab2d81eb54aeda8c34f46728859704eaf9baef8503e9a9d1  elfutils-0.160.tar.bz2
+sha256  feb307acf472598ea7af4e4b439251613a8f5d81e804b4abf9aeca195a5d4254  elfutils-portability.patch
diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk
index 4f00a27..e8ff3fc 100644
--- a/package/elfutils/elfutils.mk
+++ b/package/elfutils/elfutils.mk
@@ -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
 
@@ -68,4 +66,14 @@  else
 ELFUTILS_CONF_OPTS += --disable-progs
 endif
 
+# The --disable-werror configure option does not seem to be enough. We
+# need to remove the -Werror options from these Makefiles in order to
+# avoid compilation failures.
+define ELFUTILS_DISABLE_WERROR
+	$(SED) 's/-Werror//g' $(@D)/lib/Makefile
+	$(SED) 's/-Werror//g' $(@D)/libelf/Makefile
+	$(SED) 's/-Werror//g' $(@D)/libdwfl/Makefile
+endef
+ELFUTILS_POST_CONFIGURE_HOOKS += ELFUTILS_DISABLE_WERROR
+
 $(eval $(autotools-package))