svn commit: r505576 - in head/devel/elfutils: . files

Tobias Kortkamp tobik at FreeBSD.org
Mon Jul 1 14:55:03 UTC 2019


Author: tobik
Date: Mon Jul  1 14:55:02 2019
New Revision: 505576
URL: https://svnweb.freebsd.org/changeset/ports/505576

Log:
  devel/elfutils: Fix build with GCC 9
  
  In file included from ../config.h:132,
                   from elf32_fsize.c:31:
  libelfP.h:47:30: error: '__elf32_msize' specifies less restrictive attribute than its target 'elf32_fsize': 'const' [-Werror=missing-attributes]
     47 | #define __elfw2_(Bits, Name) __elf##Bits##_##Name
        |                              ^~~~~
  
  http://package22.nyi.freebsd.org/data/112amd64-default-PR238330/2019-06-09_20h29m30s/logs/errors/elfutils-0.174_2.log
  
  Cherry pick upstream commit be8080bdd746ac2b07fb0bcad23a9677844bb200
  
  PR:		238538
  Submitted by:	tobik
  Reported by:	gerald, antoine (via exp-run)
  Approved by:	cem (maintainer)

Added:
  head/devel/elfutils/files/patch-git_be8080bdd746   (contents, props changed)
Modified:
  head/devel/elfutils/Makefile

Modified: head/devel/elfutils/Makefile
==============================================================================
--- head/devel/elfutils/Makefile	Mon Jul  1 14:39:35 2019	(r505575)
+++ head/devel/elfutils/Makefile	Mon Jul  1 14:55:02 2019	(r505576)
@@ -3,7 +3,7 @@
 
 PORTNAME=	elfutils
 PORTVERSION=	0.174
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	https://sourceware.org/elfutils/ftp/${PORTVERSION}/
 

Added: head/devel/elfutils/files/patch-git_be8080bdd746
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/elfutils/files/patch-git_be8080bdd746	Mon Jul  1 14:55:02 2019	(r505576)
@@ -0,0 +1,32 @@
+diff --git libelf/elf32_fsize.c libelf/elf32_fsize.c
+index fddae91e..16919daa 100644
+--- libelf/elf32_fsize.c
++++ libelf/elf32_fsize.c
+@@ -64,5 +64,3 @@ elfw2(LIBELFBITS, fsize) (Elf_Type type, size_t count, unsigned int version)
+ 	  * __libelf_type_sizes[0][ELFW(ELFCLASS,LIBELFBITS) - 1][type]);
+ #endif
+ }
+-#define local_strong_alias(n1, n2) strong_alias (n1, n2)
+-local_strong_alias (elfw2(LIBELFBITS, fsize), __elfw2(LIBELFBITS, msize))
+diff --git libelf/libelfP.h libelf/libelfP.h
+index ed216c8c..c6bb992d 100644
+--- libelf/libelfP.h
++++ libelf/libelfP.h
+@@ -454,17 +454,6 @@ extern const uint_fast8_t __libelf_type_aligns[EV_NUM - 1][ELFCLASSNUM - 1][ELF_
+    be ELF_T_BYTE.  */
+ extern Elf_Type __libelf_data_type (Elf *elf, int sh_type) internal_function;
+ 
+-/* The libelf API does not have such a function but it is still useful.
+-   Get the memory size for the given type.
+-
+-   These functions cannot be marked internal since they are aliases
+-   of the export elfXX_fsize functions.*/
+-extern size_t __elf32_msize (Elf_Type __type, size_t __count,
+-			     unsigned int __version);
+-extern size_t __elf64_msize (Elf_Type __type, size_t __count,
+-			     unsigned int __version);
+-
+-
+ /* Create Elf descriptor from memory image.  */
+ extern Elf *__libelf_read_mmaped_file (int fildes, void *map_address,
+ 				       off_t offset, size_t maxsize,


More information about the svn-ports-head mailing list