summaryrefslogtreecommitdiff
path: root/devel/binutils
diff options
context:
space:
mode:
authorrichard <richard@pkgsrc.org>2014-09-10 10:14:07 +0000
committerrichard <richard@pkgsrc.org>2014-09-10 10:14:07 +0000
commit07462929ad127436974581e1388fc782f90f69e9 (patch)
tree840e30c2264db0b7bf1933e5ab743f6e3f16f35d /devel/binutils
parent66b9b670a061dd58f9cd4ddb266d6479f4a36d27 (diff)
downloadpkgsrc-07462929ad127436974581e1388fc782f90f69e9.tar.gz
adding devel/py-hgnested
hgnested is a Mercurial extension to work with nested repositories. It was inspired by the forest extension. The extension allows to apply common Mercurial commands to all the nested repositories at once like pull, push etc. It also allows to fetch a complete tree of repositories through ssh or http. To enable the "hgnested" extension, create an entry for it in your hgrc, like this: [extensions] hgnested = See `hg help hgnested` for the complete list of commands. For more information please visit the following website: http://code.google.com/p/hgnested/
Diffstat (limited to 'devel/binutils')
-rw-r--r--devel/binutils/builtin.mk34
1 files changed, 24 insertions, 10 deletions
diff --git a/devel/binutils/builtin.mk b/devel/binutils/builtin.mk
index 2367d9f06af..6ed27b822c6 100644
--- a/devel/binutils/builtin.mk
+++ b/devel/binutils/builtin.mk
@@ -1,10 +1,13 @@
-# $NetBSD: builtin.mk,v 1.6 2007/08/13 12:55:22 rillig Exp $
+# $NetBSD: builtin.mk,v 1.7 2014/09/10 10:14:07 richard Exp $
BINUTILS_PREFIX?= /usr
BUILTIN_PKG:= binutils
+
BUILTIN_FIND_FILES_VAR := BINUTILS_FILES
-BUILTIN_FIND_FILES.BINUTILS_FILES := ${BINUTILS_PREFIX}/include/bfd.h
+BUILTIN_FIND_FILES.BINUTILS_FILES := ${BINUTILS_PREFIX}/include/bfd.h \
+ ${BINUTILS_PREFIX}/gnu/include/bfd.h
+
.include "../../mk/buildlink3/bsd.builtin.mk"
###
@@ -16,6 +19,22 @@ IS_BUILTIN.binutils?= yes
.else
IS_BUILTIN.binutils?= no
.endif
+MAKEVARS+= IS_BUILTIN.binutils
+
+###
+### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
+### a package name to represent the built-in package.
+###
+.if !defined(BUILTIN_PKG.binutils) && !empty(IS_BUILTIN.binutils:M[yY][eE][sS])
+. if !empty(TOOLS_PLATFORM.readelf)
+BUILTIN_VERSION.binutils!= \
+ ${TOOLS_PLATFORM.readelf} --version | \
+ ${SED} -ne 's,^.*Binutils.*)[ ]*\([0-9\.]*\),\1,p'
+. endif
+BUILTIN_VERSION.binutils?= _unknownversion_
+BUILTIN_PKG.binutils= binutils-${BUILTIN_VERSION.binutils}
+.endif
+MAKEVARS+= BUILTIN_PKG.binutils
###
### Determine whether we should use the built-in implementation if it
@@ -52,7 +71,6 @@ USE_BUILTIN.binutils= no
. endfor
. endif # PREFER.binutils
.endif
-MAKEVARS+= USE_BUILTIN.binutils
# if USE_BINUTILS is defined, then force the use of a true binutils
# implementation.
@@ -63,6 +81,8 @@ USE_BUILTIN.binutils= no
. endif
.endif
+MAKEVARS+= USE_BUILTIN.binutils
+
###
### The section below only applies if we are not including this file
### solely to determine whether a built-in implementation exists.
@@ -70,12 +90,6 @@ USE_BUILTIN.binutils= no
CHECK_BUILTIN.binutils?= no
.if !empty(CHECK_BUILTIN.binutils:M[nN][oO])
-. if !empty(USE_BUILTIN.binutils:M[nN][oO])
-AR= ${BUILDLINK_PREFIX.binutils}/bin/ar
-AS= ${BUILDLINK_PREFIX.binutils}/bin/as
-LD= ${BUILDLINK_PREFIX.binutils}/bin/ld
-NM= ${BUILDLINK_PREFIX.binutils}/bin/nm
-RANLIB= ${BUILDLINK_PREFIX.binutils}/bin/ranlib
-. endif
+USE_TOOLS+= ar as ld nm ranlib
.endif # CHECK_BUILTIN.binutils