Update to 0.170

PR:		223607
Submitted by:	Anton Yuzhaninov
Approved by:	cem (maintainer)
This commit is contained in:
Olivier Cochard 2017-11-13 12:16:47 +00:00
parent f213be1686
commit ff8d36fa64
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=454110
11 changed files with 170 additions and 106 deletions

View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= elfutils
PORTVERSION= 0.168
PORTREVISION= 1
PORTVERSION= 0.170
CATEGORIES= devel
MASTER_SITES= https://sourceware.org/elfutils/ftp/${PORTVERSION}/
@ -16,14 +15,16 @@ LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING
LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING-GPLV2
LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING-LGPLV3
LIB_DEPENDS= libargp.so:devel/argp-standalone
PATCH_DEPENDS= gnulib>=0:devel/gnulib
BROKEN_aarch64= fails to build: fatal error: linux/uio.h: No such file or directory
BROKEN_armv6= fails to build: fails to compile i386_disasm.c
BROKEN_powerpc64= fails to build: error: field 'r' has incomplete type
BROKEN_sparc64= fails to build: fails to compile dwarf_begin_elf.c
LIB_DEPENDS= libargp.so:devel/argp-standalone
PATCH_DEPENDS= ${NONEXISTENT}:devel/gnulib:extract
PLIST_SUB= VERSION=${PORTVERSION}
OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
@ -31,11 +32,11 @@ NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls
USES= autoreconf gmake libtool tar:bzip2
USE_GCC= 4.8 # fails to build with newer versions
USE_GCC= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CFLAGS+= -Wno-unused-parameter
CFLAGS+= -Wno-null-dereference
# Give i386 a prayer of building, and we can fix the warnings later:
CFLAGS_i386+= -Wno-error
@ -43,10 +44,11 @@ CFLAGS_i386+= -Wno-error
CONFIGURE_ARGS+= --program-prefix=eu-
post-patch:
@${LN} -s `${MAKE} -C ${PORTSDIR}/devel/gnulib -V WRKSRC` ${WRKDIR}/gnulib
@${CP} -a \
${LOCALBASE}/share/gnulib/lib/obstack.c \
${LOCALBASE}/share/gnulib/lib/obstack.h \
${LOCALBASE}/share/gnulib/lib/obstack_printf.c \
${WRKDIR}/gnulib/lib/obstack.c \
${WRKDIR}/gnulib/lib/obstack.h \
${WRKDIR}/gnulib/lib/obstack_printf.c \
${WRKSRC}/lib
.include <bsd.port.mk>

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1484780542
SHA256 (elfutils-0.168.tar.bz2) = b88d07893ba1373c7dd69a7855974706d05377766568a7d9002706d5de72c276
SIZE (elfutils-0.168.tar.bz2) = 6840399
TIMESTAMP = 1510265200
SHA256 (elfutils-0.170.tar.bz2) = 1f844775576b79bdc9f9c717a50058d08620323c1e935458223a12f249c9e066
SIZE (elfutils-0.170.tar.bz2) = 8358001

View file

@ -1,10 +0,0 @@
--- backends/x86_64_initreg.c.orig 2014-06-17 18:51:09 UTC
+++ backends/x86_64_initreg.c
@@ -32,6 +32,7 @@
#include <stdlib.h>
#ifdef __x86_64__
+# include <sys/types.h>
# include <sys/user.h>
# include <sys/ptrace.h>
#endif

View file

@ -1,12 +1,12 @@
--- lib/Makefile.am.orig 2016-12-28 09:32:00 UTC
--- lib/Makefile.am.orig 2017-08-02 12:06:25 UTC
+++ lib/Makefile.am
@@ -35,7 +35,8 @@ noinst_LIBRARIES = libeu.a
libeu_a_SOURCES = xstrdup.c xstrndup.c xmalloc.c next_prime.c \
crc32.c crc32_file.c md5.c sha1.c \
- color.c version.c
+ color.c version.c error.c obstack.c \
- color.c printversion.c
+ color.c printversion.c error.c obstack.c \
+ obstack_printf.c
noinst_HEADERS = fixedsizehash.h libeu.h system.h dynamicsizehash.h list.h \
md5.h sha1.h eu-config.h
md5.h sha1.h eu-config.h color.h printversion.h bpf.h

View file

@ -1,34 +0,0 @@
--- lib/system.h.orig 2016-12-28 09:32:00 UTC
+++ lib/system.h
@@ -33,6 +33,8 @@
# include <config.h>
#endif
+#include <ssp/string.h>
+
#include <argp.h>
#include <errno.h>
#include <stddef.h>
@@ -42,16 +44,18 @@
#include <byteswap.h>
#include <unistd.h>
+#include <eu-config.h>
+
#if __BYTE_ORDER == __LITTLE_ENDIAN
# define LE32(n) (n)
# define LE64(n) (n)
-# define BE32(n) bswap_32 (n)
-# define BE64(n) bswap_64 (n)
+# define BE32(n) bswap32 (n)
+# define BE64(n) bswap64 (n)
#elif __BYTE_ORDER == __BIG_ENDIAN
# define BE32(n) (n)
# define BE64(n) (n)
-# define LE32(n) bswap_32 (n)
-# define LE64(n) bswap_64 (n)
+# define LE32(n) bswap32 (n)
+# define LE64(n) bswap64 (n)
#else
# error "Unknown byte order"
#endif

View file

@ -1,19 +1,11 @@
--- libdw/Makefile.am.orig 2016-12-25 13:36:55 UTC
--- libdw/Makefile.am.orig 2017-08-02 12:06:25 UTC
+++ libdw/Makefile.am
@@ -105,14 +105,14 @@ am_libdw_pic_a_OBJECTS = $(libdw_a_SOURC
@@ -105,7 +105,7 @@ am_libdw_pic_a_OBJECTS = $(libdw_a_SOURC
libdw_so_LIBS = libdw_pic.a ../libdwelf/libdwelf_pic.a \
../libdwfl/libdwfl_pic.a ../libebl/libebl.a
libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so
-libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS)
+libdw_so_LDLIBS = $(libdw_so_DEPS) -lz $(argp_LDADD) $(zip_LIBS)
libdw_so_SOURCES =
libdw.so$(EXEEXT): $(srcdir)/libdw.map libdw_pic.a ../libdwelf/libdwelf_pic.a \
../libdwfl/libdwfl_pic.a ../libebl/libebl.a \
- ../libelf/libelf.so
+ ../libelf/libelf.so ../lib/libeu.a
libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS)
# The rpath is necessary for libebl because its $ORIGIN use will
# not fly in a setuid executable that links in libdw.
$(AM_V_CCLD)$(LINK) -shared -o $@ -Wl,--soname,$@.$(VERSION),-z,defs \
-Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
-Wl,--version-script,$<,--no-undefined \
-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
- -ldl -lz $(argp_LDADD) $(zip_LIBS)
+ -lz $(argp_LDADD) $(zip_LIBS)
@$(textrel_check)
$(AM_V_at)ln -fs $@ $@.$(VERSION)

View file

@ -1,4 +1,4 @@
--- libelf/elf.h.orig 2016-12-25 13:36:55 UTC
--- libelf/elf.h.orig 2017-08-02 12:06:25 UTC
+++ libelf/elf.h
@@ -54,6 +54,7 @@ typedef uint64_t Elf64_Off;
/* Type for section indices, which are 16-bit quantities. */
@ -8,7 +8,7 @@
/* Type for version symbol information. */
typedef Elf32_Half Elf32_Versym;
@@ -1109,6 +1110,7 @@ typedef struct
@@ -1110,6 +1111,7 @@ typedef struct
on 64-bit platforms and vice versa. */
} a_un;
} Elf64_auxv_t;

View file

@ -1,6 +1,6 @@
--- src/readelf.c.orig 2016-12-28 09:32:01 UTC
--- src/readelf.c.orig 2017-08-02 12:06:25 UTC
+++ src/readelf.c
@@ -8037,6 +8037,7 @@ print_debug_exception_table (Dwfl_Module
@@ -8130,6 +8130,7 @@ print_debug_exception_table (Dwfl_Module
default:
dsize = 0;
error (1, 0, gettext ("invalid TType encoding"));

View file

@ -0,0 +1,31 @@
--- src/strip.c.orig 2017-08-02 12:06:25 UTC
+++ src/strip.c
@@ -85,8 +85,8 @@ static const struct argp_option options[
N_("Resolve all trivial relocations between debug sections if the removed sections are placed in a debug file (only relevant for ET_REL files, operation is not reversable, needs -f)"), 0 },
{ "remove-comment", OPT_REMOVE_COMMENT, NULL, 0,
N_("Remove .comment section"), 0 },
- { "remove-section", 'R', "SECTION", 0, N_("Remove the named section. SECTION is an extended wildcard pattern. May be given more than once. Only non-allocated sections can be removed."), 0 },
- { "keep-section", OPT_KEEP_SECTION, "SECTION", 0, N_("Keep the named section. SECTION is an extended wildcard pattern. May be given more than once."), 0 },
+ { "remove-section", 'R', "SECTION", 0, N_("Remove the named section. SECTION is an wildcard pattern. May be given more than once. Only non-allocated sections can be removed."), 0 },
+ { "keep-section", OPT_KEEP_SECTION, "SECTION", 0, N_("Keep the named section. SECTION is an wildcard pattern. May be given more than once."), 0 },
{ "permissive", OPT_PERMISSIVE, NULL, 0,
N_("Relax a few rules to handle slightly broken ELF files"), 0 },
{ NULL, 0, NULL, 0, NULL, 0 }
@@ -205,7 +205,7 @@ section_name_matches (struct section_pat
struct section_pattern *pattern = patterns;
while (pattern != NULL)
{
- if (fnmatch (pattern->pattern, name, FNM_EXTMATCH) == 0)
+ if (fnmatch (pattern->pattern, name, 0) == 0)
return true;
pattern = pattern->next;
}
@@ -313,7 +313,7 @@ parse_opt (int key, char *arg, struct ar
break;
case 'R':
- if (fnmatch (arg, ".comment", FNM_EXTMATCH) == 0)
+ if (fnmatch (arg, ".comment", 0) == 0)
remove_comment = true;
add_pattern (&remove_secs, arg);
break;

View file

@ -1,6 +1,6 @@
--- tests/Makefile.am.orig 2016-12-25 13:36:55 UTC
--- tests/Makefile.am.orig 2017-08-02 12:06:25 UTC
+++ tests/Makefile.am
@@ -382,7 +382,7 @@ libasm = -lasm
@@ -396,7 +396,7 @@ libasm = -lasm
libebl = -lebl
else !STANDALONE
if BUILD_STATIC
@ -9,9 +9,43 @@
libelf = ../libelf/libelf.a -lz
libasm = ../libasm/libasm.a
else
@@ -425,27 +425,27 @@ funcretval_LDADD = $(libdw) $(argp_LDADD
allregs_LDADD = $(libdw) $(argp_LDADD)
find_prologues_LDADD = $(libdw) $(argp_LDADD)
@@ -411,16 +411,16 @@ endif !STANDALONE
arextract_LDADD = $(libelf)
arsymtest_LDADD = $(libelf)
newfile_LDADD = $(libelf)
-saridx_LDADD = $(libelf)
+saridx_LDADD = $(libeu) $(libelf)
scnnames_LDADD = $(libelf)
-sectiondump_LDADD = $(libelf)
+sectiondump_LDADD = $(libeu) $(libelf)
showptable_LDADD = $(libelf)
hash_LDADD = $(libelf)
test_nlist_LDADD = $(libelf)
msg_tst_LDADD = $(libelf)
newscn_LDADD = $(libelf)
-early_offscn_LDADD = $(libelf)
-ecp_LDADD = $(libelf)
+early_offscn_LDADD = $(libeu) $(libelf)
+ecp_LDADD = $(libeu) $(libelf)
update1_LDADD = $(libelf)
update2_LDADD = $(libelf)
update3_LDADD = $(libdw) $(libelf)
@@ -432,34 +432,34 @@ get_lines_LDADD = $(libdw) $(libelf)
get_files_LDADD = $(libdw) $(libelf)
get_aranges_LDADD = $(libdw) $(libelf)
allfcts_LDADD = $(libdw) $(libelf)
-line2addr_LDADD = $(libdw) $(argp_LDADD)
-addrscopes_LDADD = $(libdw) $(argp_LDADD)
-funcscopes_LDADD = $(libdw) $(argp_LDADD)
-funcretval_LDADD = $(libdw) $(argp_LDADD)
-allregs_LDADD = $(libdw) $(argp_LDADD)
-find_prologues_LDADD = $(libdw) $(argp_LDADD)
+line2addr_LDADD = $(libeu) $(libdw) $(argp_LDADD)
+addrscopes_LDADD = $(libeu) $(libdw) $(argp_LDADD)
+funcscopes_LDADD = $(libeu) $(libdw) $(argp_LDADD)
+funcretval_LDADD = $(libeu) $(libdw) $(argp_LDADD)
+allregs_LDADD = $(libeu) $(libdw) $(argp_LDADD)
+find_prologues_LDADD = $(libeu) $(libdw) $(argp_LDADD)
#show_ciefde_LDADD = ../libdwarf/libdwarf.so $(libelf)
-asm_tst1_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) -ldl
-asm_tst2_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) -ldl
@ -23,6 +57,8 @@
-asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) -ldl
-asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) -ldl
-dwflmodtest_LDADD = $(libdw) $(libebl) $(libelf) $(argp_LDADD) -ldl
-rdwrmmap_LDADD = $(libelf)
-dwfl_bug_addr_overflow_LDADD = $(libdw) $(libebl) $(libelf) -ldl
+asm_tst1_LDADD = $(libasm) $(libebl) $(libelf) $(libdw)
+asm_tst2_LDADD = $(libasm) $(libebl) $(libelf) $(libdw)
+asm_tst3_LDADD = $(libasm) $(libebl) $(libelf) $(libdw)
@ -32,9 +68,8 @@
+asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libdw)
+asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) $(libdw)
+asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) $(libdw)
+dwflmodtest_LDADD = $(libdw) $(libebl) $(libelf) $(argp_LDADD)
rdwrmmap_LDADD = $(libelf)
-dwfl_bug_addr_overflow_LDADD = $(libdw) $(libebl) $(libelf) -ldl
+dwflmodtest_LDADD = $(libeu) $(libdw) $(libebl) $(libelf) $(argp_LDADD)
+rdwrmmap_LDADD = $(libeu) $(libelf)
+dwfl_bug_addr_overflow_LDADD = $(libdw) $(libebl) $(libelf)
arls_LDADD = $(libelf)
-dwfl_bug_fd_leak_LDADD = $(libdw) $(libebl) $(libelf) -ldl
@ -43,8 +78,8 @@
-dwfl_addr_sect_LDADD = $(libdw) $(libebl) $(libelf) $(argp_LDADD) -ldl
+dwfl_bug_fd_leak_LDADD = $(libdw) $(libebl) $(libelf)
+dwfl_bug_report_LDADD = $(libdw) $(libebl) $(libelf)
+dwfl_bug_getmodules_LDADD = $(libdw) $(libebl) $(libelf)
+dwfl_addr_sect_LDADD = $(libdw) $(libebl) $(libelf) $(argp_LDADD)
+dwfl_bug_getmodules_LDADD = $(libeu) $(libdw) $(libebl) $(libelf)
+dwfl_addr_sect_LDADD = $(libeu) $(libdw) $(libebl) $(libelf) $(argp_LDADD)
dwarf_getmacros_LDADD = $(libdw)
dwarf_ranges_LDADD = $(libdw)
dwarf_getstring_LDADD = $(libdw)
@ -53,3 +88,45 @@
test_flag_nobits_LDADD = $(libelf)
rerequest_tag_LDADD = $(libdw)
alldts_LDADD = $(libdw) $(libelf)
@@ -469,9 +469,9 @@ typeiter2_LDADD = $(libdw) $(libelf)
low_high_pc_LDADD = $(libdw) $(libelf) $(argp_LDADD)
test_elf_cntl_gelf_getshdr_LDADD = $(libelf)
dwflsyms_LDADD = $(libdw) $(libelf) $(argp_LDADD)
-dwfllines_LDADD = $(libdw) $(libelf) $(argp_LDADD)
-dwfl_report_elf_align_LDADD = $(libdw)
-varlocs_LDADD = $(libdw) $(libelf) $(argp_LDADD)
+dwfllines_LDADD = $(libeu) $(libdw) $(libelf) $(argp_LDADD)
+dwfl_report_elf_align_LDADD = $(libeu) $(libdw)
+varlocs_LDADD = $(libeu) $(libdw) $(libelf) $(argp_LDADD)
backtrace_LDADD = $(libdw) $(libelf) $(argp_LDADD)
# backtrace-child-biarch also uses those *_CFLAGS and *_LDLAGS variables:
backtrace_child_CFLAGS = -fPIE
@@ -480,23 +480,23 @@ backtrace_child_biarch_SOURCES = backtra
backtrace_data_LDADD = $(libdw) $(libelf)
backtrace_dwarf_CFLAGS = -Wno-unused-parameter
backtrace_dwarf_LDADD = $(libdw) $(libelf)
-debuglink_LDADD = $(libdw) $(libelf)
-debugaltlink_LDADD = $(libdw) $(libelf)
-buildid_LDADD = $(libdw) $(libelf)
+debuglink_LDADD = $(libeu) $(libdw) $(libelf)
+debugaltlink_LDADD = $(libeu) $(libdw) $(libelf)
+buildid_LDADD = $(libeu) $(libdw) $(libelf)
deleted_LDADD = ./deleted-lib.so
deleted_lib_so_LDFLAGS = -shared -rdynamic
deleted_lib_so_CFLAGS = -fPIC -fasynchronous-unwind-tables
aggregate_size_LDADD = $(libdw) $(libelf) $(argp_LDADD)
peel_type_LDADD = $(libdw) $(libelf) $(argp_LDADD)
vdsosyms_LDADD = $(libdw) $(libelf)
-getsrc_die_LDADD = $(libdw) $(libelf)
+getsrc_die_LDADD = $(libeu) $(libdw) $(libelf)
strptr_LDADD = $(libelf)
newdata_LDADD = $(libelf)
elfstrtab_LDADD = $(libelf)
dwfl_proc_attach_LDADD = $(libdw)
dwfl_proc_attach_LDFLAGS = -pthread $(AM_LDFLAGS)
elfshphehdr_LDADD =$(libelf)
-elfstrmerge_LDADD = $(libdw) $(libelf)
+elfstrmerge_LDADD = $(libeu) $(libdw) $(libelf)
dwelfgnucompressed_LDADD = $(libelf) $(libdw)
elfgetchdr_LDADD = $(libelf) $(libdw)
elfgetzdata_LDADD = $(libelf)

View file

@ -26,43 +26,49 @@ include/elfutils/version.h
include/gelf.h
include/libelf.h
include/nlist.h
lib/elfutils/libebl_aarch64-0.168.so
lib/elfutils/libebl_aarch64-%%VERSION%%.so
lib/elfutils/libebl_aarch64.so
lib/elfutils/libebl_alpha-0.168.so
lib/elfutils/libebl_alpha-%%VERSION%%.so
lib/elfutils/libebl_alpha.so
lib/elfutils/libebl_arm-0.168.so
lib/elfutils/libebl_arm-%%VERSION%%.so
lib/elfutils/libebl_arm.so
lib/elfutils/libebl_i386-0.168.so
lib/elfutils/libebl_bpf-%%VERSION%%.so
lib/elfutils/libebl_bpf.so
lib/elfutils/libebl_i386-%%VERSION%%.so
lib/elfutils/libebl_i386.so
lib/elfutils/libebl_ia64-0.168.so
lib/elfutils/libebl_ia64-%%VERSION%%.so
lib/elfutils/libebl_ia64.so
lib/elfutils/libebl_ppc-0.168.so
lib/elfutils/libebl_m68k-%%VERSION%%.so
lib/elfutils/libebl_m68k.so
lib/elfutils/libebl_ppc-%%VERSION%%.so
lib/elfutils/libebl_ppc.so
lib/elfutils/libebl_ppc64-0.168.so
lib/elfutils/libebl_ppc64-%%VERSION%%.so
lib/elfutils/libebl_ppc64.so
lib/elfutils/libebl_s390-0.168.so
lib/elfutils/libebl_s390-%%VERSION%%.so
lib/elfutils/libebl_s390.so
lib/elfutils/libebl_sh-0.168.so
lib/elfutils/libebl_sh-%%VERSION%%.so
lib/elfutils/libebl_sh.so
lib/elfutils/libebl_sparc-0.168.so
lib/elfutils/libebl_sparc-%%VERSION%%.so
lib/elfutils/libebl_sparc.so
lib/elfutils/libebl_tilegx-0.168.so
lib/elfutils/libebl_tilegx-%%VERSION%%.so
lib/elfutils/libebl_tilegx.so
lib/elfutils/libebl_x86_64-0.168.so
lib/elfutils/libebl_x86_64-%%VERSION%%.so
lib/elfutils/libebl_x86_64.so
lib/libasm-0.168.so
lib/libasm-%%VERSION%%.so
lib/libasm.a
lib/libasm.so
lib/libasm.so.1
lib/libdw-0.168.so
lib/libdw-%%VERSION%%.so
lib/libdw.a
lib/libdw.so
lib/libdw.so.1
lib/libebl.a
lib/libelf-0.168.so
lib/libelf-%%VERSION%%.so
lib/libelf.a
lib/libelf.so
lib/libelf.so.1
libdata/pkgconfig/libdw.pc
libdata/pkgconfig/libelf.pc
%%NLS%%share/locale/de/LC_MESSAGES/elfutils.mo
%%NLS%%share/locale/en@boldquot/LC_MESSAGES/elfutils.mo
%%NLS%%share/locale/en@quot/LC_MESSAGES/elfutils.mo