deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

elfutils: bump version to 0.161

Browse source 
- Bump version to 0.161
- Remove the portability patch. We don't need to have it in Buildroot
  since it includes the version number so we can download it safely
  without having collisions between versions.
- Adapt the patches that need to be adapted.
- Rename patches to start from 0001.
- Update the hash value and add a new value for the portability patch.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Vicente Olivert Riera 2015-01-06 12:02:06 +00:00 committed by Thomas Petazzoni
parent d434fcbeab
commit 4038cbf227
9 changed files with 52 additions and 1925 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
package/elfutils/0002-argp-support.patch → package/elfutils/0001-argp-support.patch
View file

@ -15,12 +15,12 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
diff -rup a/configure.ac b/configure.ac
--- a/configure.ac 2014-11-07 15:00:38.663627402 +0000
+++ b/configure.ac 2014-11-07 15:02:30.233539737 +0000
@@ -259,6 +259,13 @@ AC_ARG_ENABLE([progs],
enable_progs=yes)
AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes)
--- a/configure.ac 2015-01-06 11:30:02.170052875 +0000
+++ b/configure.ac 2015-01-06 11:31:10.122219826 +0000
@@ -253,6 +253,13 @@ AC_SUBST([LIBEBL_SUBDIR])
AC_DEFINE_UNQUOTED(LIBEBL_SUBDIR, "$LIBEBL_SUBDIR")
AH_TEMPLATE([LIBEBL_SUBDIR], [$libdir subdirectory containing libebl modules.])
+AC_CHECK_FUNC([argp_parse])
+if test "$ac_cv_func_argp_parse" != yes; then
+ AC_CHECK_LIB([argp],[argp_parse],ARGP_LIBS=-largp,
@ -32,24 +32,24 @@ diff -rup a/configure.ac b/configure.ac
dnl conditional and config.h USE_ZLIB/USE_BZLIB #define.
save_LIBS="$LIBS"
diff -rup a/libdw/Makefile.am b/libdw/Makefile.am
--- a/libdw/Makefile.am 2014-08-27 10:25:17.000000000 +0100
+++ b/libdw/Makefile.am 2014-11-07 15:09:32.804794962 +0000
@@ -110,7 +110,7 @@ libdw.so$(EXEEXT): $(srcdir)/libdw.map l
-Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
-Wl,--version-script,$<,--no-undefined \
-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
--- a/libdw/Makefile.am 2014-12-19 20:43:11.000000000 +0000
+++ b/libdw/Makefile.am 2015-01-06 11:32:21.075438524 +0000
@@ -112,7 +112,7 @@ libdw.so$(EXEEXT): $(srcdir)/libdw.map l
-Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
-Wl,--version-script,$<,--no-undefined \
-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
- -ldl $(zip_LIBS)
+ -ldl $(zip_LIBS) $(ARGP_LIBS)
if $(READELF) -d $@ | fgrep -q TEXTREL; then exit 1; fi
ln -fs $@ $@.$(VERSION)
@$(textrel_check)
ln -fs $@ $@.$(VERSION)
diff -rup a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am 2014-11-07 15:00:35.867579484 +0000
+++ b/src/Makefile.am 2014-11-07 15:08:47.380013980 +0000
--- a/src/Makefile.am 2015-01-06 11:30:02.430057339 +0000
+++ b/src/Makefile.am 2015-01-06 11:34:53.061049752 +0000
@@ -94,27 +94,29 @@ readelf_no_Werror = yes
strings_no_Werror = yes
addr2line_no_Wformat = yes
-readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl
+readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl $(ARGP_LIBS)
nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl \
@ -88,6 +88,6 @@ diff -rup a/src/Makefile.am b/src/Makefile.am
+unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) -ldl $(ARGP_LIBS)
+stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) -ldl \
+ $(demanglelib) $(ARGP_LIBS)
ldlex.o: ldscript.c
ldlex_no_Werror = yes

1875
package/elfutils/0001-elfutils-portability.patch
View file

File diff suppressed because it is too large Load diff

24
package/elfutils/0003-disable-progs.patch → package/elfutils/0002-disable-progs.patch
View file

@ -13,12 +13,12 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
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.])
--- a/configure.ac 2015-01-06 11:31:10.122219826 +0000
+++ b/configure.ac 2015-01-06 11:37:38.397891424 +0000
@@ -260,6 +260,12 @@ if test "$ac_cv_func_argp_parse" != yes;
fi
AC_SUBST(ARGP_LIBS)
+AC_ARG_ENABLE([progs],
+ AS_HELP_STRING([--enable-progs], [enable progs]),
+ enable_progs=$enableval,
@ -29,12 +29,12 @@ diff -rup a/configure.ac b/configure.ac
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
--- a/Makefile.am 2014-06-17 19:51:09.000000000 +0100
+++ b/Makefile.am 2015-01-06 11:38:42.846999410 +0000
@@ -22,9 +22,13 @@ ACLOCAL_AMFLAGS = -I m4
pkginclude_HEADERS = version.h
+if ENABLE_PROGS
+PROGS_SUBDIR = src
+endif
@ -43,6 +43,6 @@ diff -rup a/Makefile.am b/Makefile.am
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
COPYING COPYING-GPLV2 COPYING-LGPLV3

34
package/elfutils/0004-fts.patch → package/elfutils/0003-fts.patch
View file

@ -28,12 +28,12 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
diff -Nrup a/configure.ac b/configure.ac
--- a/configure.ac 2014-11-07 15:14:42.402119092 +0000
+++ b/configure.ac 2014-11-07 15:16:50.161316781 +0000
@@ -266,6 +266,10 @@ if test "$ac_cv_func_argp_parse" != yes;
fi
AC_SUBST(ARGP_LIBS)
--- a/configure.ac 2015-01-06 11:37:38.397891424 +0000
+++ b/configure.ac 2015-01-06 11:40:53.568258759 +0000
@@ -266,6 +266,10 @@ AC_ARG_ENABLE([progs],
enable_progs=yes)
AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes)
+AC_CHECK_HEADER([fts.h],
+ AC_DEFINE([HAVE_FTS_H], [], [Define if <fts.h> is available in C library]))
+AM_CONDITIONAL(HAVE_FTS, test "$ac_cv_header_fts_h" = yes)
@ -43,7 +43,7 @@ diff -Nrup a/configure.ac b/configure.ac
save_LIBS="$LIBS"
diff -Nrup a/libdwfl/fts.c b/libdwfl/fts.c
--- a/libdwfl/fts.c 1970-01-01 01:00:00.000000000 +0100
+++ b/libdwfl/fts.c 2014-11-07 15:25:08.325879956 +0000
+++ b/libdwfl/fts.c 2015-01-06 11:42:13.481640322 +0000
@@ -0,0 +1,1095 @@
+/*-
+ * Copyright (c) 1990, 1993, 1994
@ -1142,7 +1142,7 @@ diff -Nrup a/libdwfl/fts.c b/libdwfl/fts.c
+}
diff -Nrup a/libdwfl/fts_.h b/libdwfl/fts_.h
--- a/libdwfl/fts_.h 1970-01-01 01:00:00.000000000 +0100
+++ b/libdwfl/fts_.h 2014-11-07 15:26:00.806777392 +0000
+++ b/libdwfl/fts_.h 2015-01-06 11:42:13.481640322 +0000
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 1989, 1993
@ -1276,23 +1276,23 @@ diff -Nrup a/libdwfl/fts_.h b/libdwfl/fts_.h
+
+#endif /* fts.h */
diff -Nrup a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c
--- a/libdwfl/linux-kernel-modules.c 2014-08-27 10:25:17.000000000 +0100
+++ b/libdwfl/linux-kernel-modules.c 2014-11-07 15:27:10.783974209 +0000
--- a/libdwfl/linux-kernel-modules.c 2014-11-22 22:43:52.000000000 +0000
+++ b/libdwfl/linux-kernel-modules.c 2015-01-06 11:44:25.610924805 +0000
@@ -29,7 +29,11 @@
/* We include this before config.h because it can't handle _FILE_OFFSET_BITS.
Everything we need here is fine if its declarations just come first. */
+#ifdef HAVE_FTS_H
#include <fts.h>
+#else
+#include "fts_.h"
+#include <fts_.h>
+#endif
#include <config.h>
diff -Nrup a/libdwfl/Makefile.am b/libdwfl/Makefile.am
--- a/libdwfl/Makefile.am 2014-08-27 10:25:17.000000000 +0100
+++ b/libdwfl/Makefile.am 2014-11-07 15:17:57.682478408 +0000
--- a/libdwfl/Makefile.am 2014-06-17 19:51:09.000000000 +0100
+++ b/libdwfl/Makefile.am 2015-01-06 11:45:25.442959369 +0000
@@ -79,6 +79,9 @@ endif
if LZMA
libdwfl_a_SOURCES += lzma.c
@ -1300,6 +1300,6 @@ diff -Nrup a/libdwfl/Makefile.am b/libdwfl/Makefile.am
+if !HAVE_FTS
+libdwfl_a_SOURCES += fts.c
+endif
libdwfl = $(libdw)
libdw = ../libdw/libdw.so

0
package/elfutils/0005-disable-po.patch → package/elfutils/0004-disable-po.patch
View file

0
package/elfutils/0006-really-make-werror-conditional-to-build-werror.patch → package/elfutils/0005-really-make-werror-conditional-to-build-werror.patch
View file

0
package/elfutils/0007-memcpy-def.patch → package/elfutils/0006-memcpy-def.patch
View file

3
package/elfutils/elfutils.hash
View file

@ -1,2 +1,3 @@
# Locally calculated
sha256 741b556863c069ceab2d81eb54aeda8c34f46728859704eaf9baef8503e9a9d1 elfutils-0.160.tar.bz2
sha256 570c91a1783fa5386aaa2dfdd08dda1de777c2b63bf3b9c1437d635ffdd7a070 elfutils-0.161.tar.bz2
sha256 bf0363d03e1e4668778eb4e7ddd10e405a22f753b3ad813a537fc01164d1e3fe elfutils-portability-0.161.patch

3
package/elfutils/elfutils.mk
View file

@ -4,12 +4,13 @@
#
################################################################################
ELFUTILS_VERSION = 0.160
ELFUTILS_VERSION = 0.161
ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2
ELFUTILS_SITE = https://fedorahosted.org/releases/e/l/elfutils/$(ELFUTILS_VERSION)
ELFUTILS_INSTALL_STAGING = YES
ELFUTILS_LICENSE = GPLv3 GPLv2 LGPLv3
ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3
ELFUTILS_PATCH = elfutils-portability-0.161.patch
# The tarball does not have a generated configure script
ELFUTILS_AUTORECONF = YES