Index: head/devel/elfutils/Makefile =================================================================== --- head/devel/elfutils/Makefile (revision 473111) +++ head/devel/elfutils/Makefile (revision 473112) @@ -1,55 +1,56 @@ # Created by: Conrad Meyer # $FreeBSD$ PORTNAME= elfutils -PORTVERSION= 0.170 -PORTREVISION= 1 +PORTVERSION= 0.172 CATEGORIES= devel MASTER_SITES= https://sourceware.org/elfutils/ftp/${PORTVERSION}/ MAINTAINER= cem@FreeBSD.org COMMENT= Library for manipulating ELF files and partial implementation of binutils LICENSE= LGPL3 GPLv2+ GPLv3+ LICENSE_COMB= multi LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING-GPLV2 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING-LGPLV3 +IGNORE_FreeBSD_11= stable/10 and 11.0 base libelf.h lack needed ELF types + 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_armv7= fails to build: fails to compile i386_disasm.c +BROKEN_sparc64= sparc patch does not apply cleanly to 0.172 LIB_DEPENDS= libargp.so:devel/argp-standalone -PATCH_DEPENDS= ${NONEXISTENT}:devel/gnulib:extract +PATCH_DEPENDS= gnulib>=0:devel/gnulib:extract PLIST_SUB= VERSION=${PORTVERSION} OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext NLS_USES_OFF= gettext # used anyway NLS_CONFIGURE_ENABLE= nls USES= autoreconf gmake libtool tar:bzip2 USE_GCC= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CFLAGS+= -Wno-null-dereference +CFLAGS+= -Wno-null-dereference -Wno-unused-value # Give i386 a prayer of building, and we can fix the warnings later: CFLAGS_i386+= -Wno-error # Avoid conflict with binutils / elftoolchain programs with the same names: CONFIGURE_ARGS+= --program-prefix=eu- post-patch: - @${LN} -s `${MAKE} -C ${PORTSDIR}/devel/gnulib -V WRKSRC` ${WRKDIR}/gnulib @${CP} -a \ - ${WRKDIR}/gnulib/lib/obstack.c \ - ${WRKDIR}/gnulib/lib/obstack.h \ - ${WRKDIR}/gnulib/lib/obstack_printf.c \ + ${LOCALBASE}/share/gnulib/lib/obstack.c \ + ${LOCALBASE}/share/gnulib/lib/obstack.h \ + ${LOCALBASE}/share/gnulib/lib/obstack_printf.c \ ${WRKSRC}/lib .include Index: head/devel/elfutils/distinfo =================================================================== --- head/devel/elfutils/distinfo (revision 473111) +++ head/devel/elfutils/distinfo (revision 473112) @@ -1,3 +1,3 @@ -TIMESTAMP = 1510265200 -SHA256 (elfutils-0.170.tar.bz2) = 1f844775576b79bdc9f9c717a50058d08620323c1e935458223a12f249c9e066 -SIZE (elfutils-0.170.tar.bz2) = 8358001 +TIMESTAMP = 1528748700 +SHA256 (elfutils-0.172.tar.bz2) = 779c99e6344c4982bbab60b8d276cec3d468151c758905f9a44ba6b6edaa0e24 +SIZE (elfutils-0.172.tar.bz2) = 8601066 Index: head/devel/elfutils/files/patch-backends_sparc__initreg.c =================================================================== --- head/devel/elfutils/files/patch-backends_sparc__initreg.c (revision 473111) +++ head/devel/elfutils/files/patch-backends_sparc__initreg.c (nonexistent) @@ -1,80 +0,0 @@ ---- backends/sparc_initreg.c.orig 2017-06-19 14:45:16 UTC -+++ backends/sparc_initreg.c -@@ -33,7 +33,7 @@ - #include "system.h" - #include - #ifdef __sparc__ --# include -+# include - # include - #endif - -@@ -50,29 +50,29 @@ EBLHOOK (set_initial_registers_tid) (pid - #else /* __sparc__ */ - - -- /* The pt_regs structure filled in by PTRACE_GETREGS provides the -+ /* The pt_regs structure filled in by PT_GETREGS provides the - PC, the global registers and the output registers. Note how the - %g0 register is not explicitly provided in the structure (it's - value is always 0) and the resulting weird packing in the u_regs - array: the last element is not used. */ - -- struct pt_regs regs; -- if (ptrace (PTRACE_GETREGS, tid, ®s, 0) == -1) -+ struct reg regs; -+ if (ptrace (PT_GETREGS, tid, (caddr_t)®s, 0) == -1) - return false; - - /* PC: no DWARF number */ -- if (!setfunc (-1, 1, (Dwarf_Word *) ®s.tpc, arg)) -+ if (!setfunc (-1, 1, (Dwarf_Word *) ®s.r_tpc, arg)) - return false; - - /* Global registers: DWARF 0 .. 7 */ - Dwarf_Word zero = 0; - if (!setfunc (0, 1, &zero, arg)) - return false; -- if (!setfunc (1, 7, (Dwarf_Word *) ®s.u_regs[0], arg)) -+ if (!setfunc (1, 7, (Dwarf_Word *) ®s.r_global[0], arg)) - return false; - - /* Output registers: DWARF 8 .. 15 */ -- if (!setfunc (8, 8, (Dwarf_Word *) ®s.u_regs[7], arg)) -+ if (!setfunc (8, 8, (Dwarf_Word *) ®s.r_out[0], arg)) - return false; - - /* Local and input registers must be read from the stack. They are -@@ -80,7 +80,7 @@ EBLHOOK (set_initial_registers_tid) (pid - read above. */ - - Dwarf_Word locals_outs[16]; -- Dwarf_Word sp = regs.u_regs[13]; -+ Dwarf_Word sp = regs.r_out[5]; - - if (sp & 1) - { -@@ -91,9 +91,9 @@ EBLHOOK (set_initial_registers_tid) (pid - - for (unsigned i = 0; i < 16; i++) - { -- locals_outs[i] = ptrace (PTRACE_PEEKDATA, tid, -+ locals_outs[i] = ptrace (PT_READ_D, tid, - (void *) (uintptr_t) (sp + (i * 8)), -- NULL); -+ 0); - if (errno != 0) - return false; - } -@@ -104,9 +104,9 @@ EBLHOOK (set_initial_registers_tid) (pid - - for (unsigned i = 0; i < 8; i++) - { -- Dwarf_Word tuple = ptrace (PTRACE_PEEKDATA, tid, -+ Dwarf_Word tuple = ptrace (PT_READ_D, tid, - (void *) (uintptr_t) (sp + (i * 8)), -- NULL); -+ 0); - if (errno != 0) - return false; - Property changes on: head/devel/elfutils/files/patch-backends_sparc__initreg.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/elfutils/files/patch-lib_Makefile.am =================================================================== --- head/devel/elfutils/files/patch-lib_Makefile.am (revision 473111) +++ head/devel/elfutils/files/patch-lib_Makefile.am (revision 473112) @@ -1,12 +1,12 @@ ---- lib/Makefile.am.orig 2017-08-02 12:06:25 UTC +--- lib/Makefile.am.orig 2017-11-22 03:44:22.000000000 -0800 +++ lib/Makefile.am -@@ -35,7 +35,8 @@ noinst_LIBRARIES = libeu.a +@@ -35,7 +35,8 @@ libeu_a_SOURCES = xstrdup.c xstrndup.c xmalloc.c next_prime.c \ - crc32.c crc32_file.c md5.c sha1.c \ + crc32.c crc32_file.c \ - color.c printversion.c -+ color.c printversion.c error.c obstack.c \ -+ obstack_printf.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 color.h printversion.h bpf.h + eu-config.h color.h printversion.h bpf.h Index: head/devel/elfutils/files/patch-tests_Makefile.am =================================================================== --- head/devel/elfutils/files/patch-tests_Makefile.am (revision 473111) +++ head/devel/elfutils/files/patch-tests_Makefile.am (revision 473112) @@ -1,132 +1,132 @@ ---- tests/Makefile.am.orig 2017-08-02 12:06:25 UTC +--- tests/Makefile.am.orig 2018-06-01 07:42:27.000000000 -0700 +++ tests/Makefile.am -@@ -396,7 +396,7 @@ libasm = -lasm +@@ -432,7 +432,7 @@ libebl = -lebl else !STANDALONE if BUILD_STATIC -libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl +libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) libelf = ../libelf/libelf.a -lz libasm = ../libasm/libasm.a else -@@ -411,16 +411,16 @@ endif !STANDALONE +@@ -447,16 +447,16 @@ 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) +@@ -468,34 +468,34 @@ 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 -asm_tst3_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) -ldl -asm_tst4_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) -ldl -asm_tst5_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) -ldl -asm_tst6_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) -ldl -asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) -ldl -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) +asm_tst4_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) +asm_tst5_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) +asm_tst6_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) +asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) +asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) +asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) +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 -dwfl_bug_report_LDADD = $(libdw) $(libebl) $(libelf) -ldl -dwfl_bug_getmodules_LDADD = $(libdw) $(libebl) $(libelf) -ldl -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 = $(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) -addrcfi_LDADD = $(libdw) $(libebl) $(libelf) $(argp_LDADD) -ldl +addrcfi_LDADD = $(libdw) $(libebl) $(libelf) $(argp_LDADD) test_flag_nobits_LDADD = $(libelf) rerequest_tag_LDADD = $(libdw) alldts_LDADD = $(libdw) $(libelf) -@@ -469,9 +469,9 @@ typeiter2_LDADD = $(libdw) $(libelf) +@@ -504,9 +504,9 @@ 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_child_CFLAGS = $(fpie_CFLAGS) +@@ -515,23 +515,23 @@ 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 + deleted_lib_so_LDFLAGS = -shared + deleted_lib_so_CFLAGS = $(fpic_CFLAGS) -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)