From owner-svn-ports-head@freebsd.org Thu Jul 14 18:45:55 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D55ADB99D1E; Thu, 14 Jul 2016 18:45:55 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A6FF81721; Thu, 14 Jul 2016 18:45:55 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6EIjsnj038170; Thu, 14 Jul 2016 18:45:54 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6EIjsCb038167; Thu, 14 Jul 2016 18:45:54 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201607141845.u6EIjsCb038167@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: "Conrad E. Meyer" Date: Thu, 14 Jul 2016 18:45:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418553 - in head/devel/elfutils: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2016 18:45:55 -0000 Author: cem (src committer) Date: Thu Jul 14 18:45:54 2016 New Revision: 418553 URL: https://svnweb.freebsd.org/changeset/ports/418553 Log: elfutils-0.163_4 - Correct gnulib dependency to PATCH_DEPENDS, per Bapt. - Rely on USE_AUTOTOOLS :env to pull in automake for BUILD. - Move re-automake rule to pre-configure, when the tool is available. - Adapt installed gelf.h header to define needed non-standard Elf types as needed, rather than trying to add them to base elf headers. Reviewed by: portlint Sponsored by: EMC / Isilon Storage Division Added: head/devel/elfutils/files/patch-libelf_elf.h (contents, props changed) head/devel/elfutils/files/patch-libelf_gelf.h (contents, props changed) Modified: head/devel/elfutils/Makefile Modified: head/devel/elfutils/Makefile ============================================================================== --- head/devel/elfutils/Makefile Thu Jul 14 18:39:51 2016 (r418552) +++ head/devel/elfutils/Makefile Thu Jul 14 18:45:54 2016 (r418553) @@ -3,7 +3,7 @@ PORTNAME= elfutils PORTVERSION= 0.163 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= https://fedorahosted.org/releases/e/l/elfutils/$(PORTVERSION)/ @@ -16,8 +16,7 @@ LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING-GPLV2 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING-LGPLV3 -BUILD_DEPENDS= gnulib>=0:devel/gnulib \ - automake>=0:devel/automake +PATCH_DEPENDS= gnulib>=0:devel/gnulib OPTIONS_DEFINE= NLS OPTIONS_SUB= yes @@ -26,7 +25,7 @@ NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls USES= gmake libtool tar:bzip2 -USE_AUTOTOOLS= automake +USE_AUTOTOOLS= automake:env USE_GCC= 4.9+ GNU_CONFIGURE= yes @@ -34,17 +33,13 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --program-prefix=eu- post-patch: - @cd $(WRKSRC) && ${AUTOMAKE} @${CP} -a \ $(LOCALBASE)/share/gnulib/lib/obstack.c \ $(LOCALBASE)/share/gnulib/lib/obstack.h \ $(LOCALBASE)/share/gnulib/lib/obstack_printf.c \ $(WRKSRC)/lib -.include - -.if ${OSVERSION} < 1200002 -IGNORE= requires CURRENT elf header changes -.endif +pre-configure: + @cd $(WRKSRC) && ${AUTOMAKE} -.include +.include Added: head/devel/elfutils/files/patch-libelf_elf.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/elfutils/files/patch-libelf_elf.h Thu Jul 14 18:45:54 2016 (r418553) @@ -0,0 +1,18 @@ +--- libelf/elf.h.orig 2015-06-10 19:44:33 UTC ++++ libelf/elf.h +@@ -54,6 +54,7 @@ typedef uint64_t Elf64_Off; + /* Type for section indices, which are 16-bit quantities. */ + typedef uint16_t Elf32_Section; + typedef uint16_t Elf64_Section; ++#define LIBELF_ELF_SECTION_DEFINED 1 + + /* Type for version symbol information. */ + typedef Elf32_Half Elf32_Versym; +@@ -972,6 +973,7 @@ typedef struct + on 64-bit platforms and vice versa. */ + } a_un; + } Elf64_auxv_t; ++#define LIBELF_ELF_AUXV_T_DEFINED 1 + + /* Legal values for a_type (entry type). */ + Added: head/devel/elfutils/files/patch-libelf_gelf.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/elfutils/files/patch-libelf_gelf.h Thu Jul 14 18:45:54 2016 (r418553) @@ -0,0 +1,33 @@ +--- libelf/gelf.h.orig 2014-02-05 00:21:44 UTC ++++ libelf/gelf.h +@@ -65,6 +65,10 @@ typedef Elf64_Ehdr GElf_Ehdr; + typedef Elf64_Shdr GElf_Shdr; + + /* Section index. */ ++#ifndef LIBELF_ELF_SECTION_DEFINED ++/* Type for section indices, which are 16-bit quantities. */ ++typedef uint16_t Elf64_Section; ++#endif + /* XXX This should probably be a larger type in preparation of times when + regular section indices can be larger. */ + typedef Elf64_Section GElf_Section; +@@ -107,6 +111,19 @@ typedef Elf64_Versym GElf_Versym; + + + /* Auxiliary vector. */ ++#ifndef LIBELF_ELF_AUXV_T_DEFINED ++typedef struct ++{ ++ uint64_t a_type; /* Entry type */ ++ union ++ { ++ uint64_t a_val; /* Integer value */ ++ /* We use to have pointer elements added here. We cannot do that, ++ though, since it does not work when using 32-bit definitions ++ on 64-bit platforms and vice versa. */ ++ } a_un; ++} Elf64_auxv_t; ++#endif + typedef Elf64_auxv_t GElf_auxv_t; + +