Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 Nov 2016 17:03:32 +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: r425895 - head/devel/elfutils/files
Message-ID:  <201611111703.uABH3WLC027777@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cem (src committer)
Date: Fri Nov 11 17:03:31 2016
New Revision: 425895
URL: https://svnweb.freebsd.org/changeset/ports/425895

Log:
  elfutils: Fix build on CURRENT
  
  CURRENT added a #define for basename, which conflicts with elfutils'.
  Undefine it before defining ours.
  
  Reported by:	pkg-fallout
  Reviewed by:	bapt@
  Sponsored by:	Dell EMC Isilon
  Differential Revision:	https://reviews.freebsd.org/D8476

Modified:
  head/devel/elfutils/files/patch-lib_eu-config.h

Modified: head/devel/elfutils/files/patch-lib_eu-config.h
==============================================================================
--- head/devel/elfutils/files/patch-lib_eu-config.h	Fri Nov 11 16:58:20 2016	(r425894)
+++ head/devel/elfutils/files/patch-lib_eu-config.h	Fri Nov 11 17:03:31 2016	(r425895)
@@ -1,6 +1,6 @@
 --- lib/eu-config.h.orig	2015-06-11 11:38:55 UTC
 +++ lib/eu-config.h
-@@ -187,4 +187,167 @@ asm (".section predict_data, \"aw\"; .pr
+@@ -187,4 +187,170 @@ asm (".section predict_data, \"aw\"; .pr
  #endif
  
  
@@ -75,6 +75,9 @@
 +		slash = path;
 +	return (__DECONST(char *, slash));
 +}
++#ifdef	basename
++#undef	basename
++#endif
 +#define	basename	eu_basename
 +
 +#ifndef	TEMP_FAILURE_RETRY



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