From owner-svn-src-all@freebsd.org Mon Apr 18 13:14:01 2016 Return-Path: Delivered-To: svn-src-all@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 8BBEBB13591; Mon, 18 Apr 2016 13:14:01 +0000 (UTC) (envelope-from emaste@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 4D53A1CBC; Mon, 18 Apr 2016 13:14:01 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3IDE0Nl064828; Mon, 18 Apr 2016 13:14:00 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3IDDxsK064810; Mon, 18 Apr 2016 13:13:59 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201604181313.u3IDDxsK064810@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 18 Apr 2016 13:13:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298204 - in head: lib/libdwarf lib/libelf lib/libelftc usr.bin/addr2line usr.bin/cxxfilt usr.bin/elfcopy usr.bin/nm usr.bin/readelf usr.bin/size usr.bin/strings X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2016 13:14:01 -0000 Author: emaste Date: Mon Apr 18 13:13:59 2016 New Revision: 298204 URL: https://svnweb.freebsd.org/changeset/base/298204 Log: Replace ${CURDIR}/../.. with ${CURDIR:H:H} in elftoolchain This produces a nicer path in debug info and build logs. MFC after: 1 week Sponsored by: The FreeBSD Foundation Modified: head/lib/libdwarf/Makefile head/lib/libelf/Makefile head/lib/libelftc/Makefile head/usr.bin/addr2line/Makefile head/usr.bin/cxxfilt/Makefile head/usr.bin/elfcopy/Makefile head/usr.bin/nm/Makefile head/usr.bin/readelf/Makefile head/usr.bin/size/Makefile head/usr.bin/strings/Makefile Modified: head/lib/libdwarf/Makefile ============================================================================== --- head/lib/libdwarf/Makefile Mon Apr 18 11:39:41 2016 (r298203) +++ head/lib/libdwarf/Makefile Mon Apr 18 13:13:59 2016 (r298204) @@ -2,7 +2,7 @@ .include PACKAGE=lib${LIB} -TOP= ${.CURDIR}/../../contrib/elftoolchain +TOP= ${.CURDIR:H:H}/contrib/elftoolchain SRCDIR= ${TOP}/libdwarf .PATH: ${SRCDIR} Modified: head/lib/libelf/Makefile ============================================================================== --- head/lib/libelf/Makefile Mon Apr 18 11:39:41 2016 (r298203) +++ head/lib/libelf/Makefile Mon Apr 18 13:13:59 2016 (r298204) @@ -5,7 +5,7 @@ SHLIBDIR?= /lib .include -TOP= ${.CURDIR}/../../contrib/elftoolchain +TOP= ${.CURDIR:H:H}/contrib/elftoolchain SRCDIR= ${TOP}/libelf .PATH: ${SRCDIR} Modified: head/lib/libelftc/Makefile ============================================================================== --- head/lib/libelftc/Makefile Mon Apr 18 11:39:41 2016 (r298203) +++ head/lib/libelftc/Makefile Mon Apr 18 13:13:59 2016 (r298204) @@ -4,7 +4,7 @@ PACKAGE=lib${LIB} INTERNALLIB= -ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain +ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain .PATH: ${ELFTCDIR}/libelftc Modified: head/usr.bin/addr2line/Makefile ============================================================================== --- head/usr.bin/addr2line/Makefile Mon Apr 18 11:39:41 2016 (r298203) +++ head/usr.bin/addr2line/Makefile Mon Apr 18 13:13:59 2016 (r298204) @@ -2,7 +2,7 @@ .include -ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain +ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain ADDR2LINEDIR= ${ELFTCDIR}/addr2line .PATH: ${ADDR2LINEDIR} Modified: head/usr.bin/cxxfilt/Makefile ============================================================================== --- head/usr.bin/cxxfilt/Makefile Mon Apr 18 11:39:41 2016 (r298203) +++ head/usr.bin/cxxfilt/Makefile Mon Apr 18 13:13:59 2016 (r298204) @@ -2,7 +2,7 @@ .include -ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain +ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain SRCDIR= ${ELFTCDIR}/cxxfilt .PATH: ${SRCDIR} Modified: head/usr.bin/elfcopy/Makefile ============================================================================== --- head/usr.bin/elfcopy/Makefile Mon Apr 18 11:39:41 2016 (r298203) +++ head/usr.bin/elfcopy/Makefile Mon Apr 18 13:13:59 2016 (r298204) @@ -2,7 +2,7 @@ .include -ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain +ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain ELFCOPYDIR= ${ELFTCDIR}/elfcopy .PATH: ${ELFCOPYDIR} Modified: head/usr.bin/nm/Makefile ============================================================================== --- head/usr.bin/nm/Makefile Mon Apr 18 11:39:41 2016 (r298203) +++ head/usr.bin/nm/Makefile Mon Apr 18 13:13:59 2016 (r298204) @@ -2,7 +2,7 @@ .include -ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain +ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain NMDIR= ${ELFTCDIR}/nm .PATH: ${NMDIR} Modified: head/usr.bin/readelf/Makefile ============================================================================== --- head/usr.bin/readelf/Makefile Mon Apr 18 11:39:41 2016 (r298203) +++ head/usr.bin/readelf/Makefile Mon Apr 18 13:13:59 2016 (r298204) @@ -1,6 +1,6 @@ # $FreeBSD$ -ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain +ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain READELFDIR= ${ELFTCDIR}/readelf .PATH: ${READELFDIR} Modified: head/usr.bin/size/Makefile ============================================================================== --- head/usr.bin/size/Makefile Mon Apr 18 11:39:41 2016 (r298203) +++ head/usr.bin/size/Makefile Mon Apr 18 13:13:59 2016 (r298204) @@ -2,7 +2,7 @@ .include -ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain +ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain SIZEDIR= ${ELFTCDIR}/size .PATH: ${SIZEDIR} Modified: head/usr.bin/strings/Makefile ============================================================================== --- head/usr.bin/strings/Makefile Mon Apr 18 11:39:41 2016 (r298203) +++ head/usr.bin/strings/Makefile Mon Apr 18 13:13:59 2016 (r298204) @@ -2,7 +2,7 @@ .include -ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain +ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain .PATH: ${ELFTCDIR}/strings