Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 13 Jul 2016 23:10:27 +0000 (UTC)
From:      "Conrad E. Meyer" <cem@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r418509 - in head/devel/elfutils: . files
Message-ID:  <201607132310.u6DNARPx098058@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cem (src committer)
Date: Wed Jul 13 23:10:27 2016
New Revision: 418509
URL: https://svnweb.freebsd.org/changeset/ports/418509

Log:
  elfutils: Revert installing elfutils' elf.h
  
  This conflicts with base elf.h.  Instead, add needed types (and perhaps
  numeric definitions) to base elf.h.
  
  Sponsored by:	EMC / Isilon Storage Division

Deleted:
  head/devel/elfutils/files/patch-libelf_Makefile.am
Modified:
  head/devel/elfutils/Makefile
  head/devel/elfutils/files/patch-libelf_libelf.h
  head/devel/elfutils/pkg-plist

Modified: head/devel/elfutils/Makefile
==============================================================================
--- head/devel/elfutils/Makefile	Wed Jul 13 22:12:10 2016	(r418508)
+++ head/devel/elfutils/Makefile	Wed Jul 13 23:10:27 2016	(r418509)
@@ -3,7 +3,7 @@
 
 PORTNAME=	elfutils
 PORTVERSION=	0.163
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://fedorahosted.org/releases/e/l/elfutils/$(PORTVERSION)/
 
@@ -39,6 +39,5 @@ post-patch:
 	    $(LOCALBASE)/share/gnulib/lib/obstack.h \
 	    $(LOCALBASE)/share/gnulib/lib/obstack_printf.c \
 	    $(WRKSRC)/lib
-	@cd $(WRKSRC) && ${LN} -s libelf elfutils
 
 .include <bsd.port.mk>

Modified: head/devel/elfutils/files/patch-libelf_libelf.h
==============================================================================
--- head/devel/elfutils/files/patch-libelf_libelf.h	Wed Jul 13 22:12:10 2016	(r418508)
+++ head/devel/elfutils/files/patch-libelf_libelf.h	Wed Jul 13 23:10:27 2016	(r418509)
@@ -1,14 +1,5 @@
 --- libelf/libelf.h.orig	2014-08-18 19:48:26 UTC
 +++ libelf/libelf.h
-@@ -32,7 +32,7 @@
- #include <sys/types.h>
- 
- /* Get the ELF types.  */
--#include <elf.h>
-+#include <elfutils/elf.h>
- 
- 
- /* Known translation types.  */
 @@ -74,7 +74,7 @@ typedef struct
    Elf_Type d_type;		/* Type of this piece of data.  */
    unsigned int d_version;	/* ELF version.  */

Modified: head/devel/elfutils/pkg-plist
==============================================================================
--- head/devel/elfutils/pkg-plist	Wed Jul 13 22:12:10 2016	(r418508)
+++ head/devel/elfutils/pkg-plist	Wed Jul 13 23:10:27 2016	(r418509)
@@ -16,7 +16,6 @@ bin/eu-strip
 bin/eu-unstrip
 include/dwarf.h
 include/elfutils/elf-knowledge.h
-include/elfutils/elf.h
 include/elfutils/known-dwarf.h
 include/elfutils/libasm.h
 include/elfutils/libdw.h



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607132310.u6DNARPx098058>