summaryrefslogtreecommitdiffstats
path: root/rules/binutils.make
diff options
context:
space:
mode:
Diffstat (limited to 'rules/binutils.make')
-rw-r--r--rules/binutils.make27
1 files changed, 17 insertions, 10 deletions
diff --git a/rules/binutils.make b/rules/binutils.make
index 6c61d75a1..be271e2e6 100644
--- a/rules/binutils.make
+++ b/rules/binutils.make
@@ -2,7 +2,7 @@
# $Id$
#
# Copyright (C) 2006 by Robert Schwebel
-#
+#
# See CREDITS for details about who has contributed to this project.
#
# For further information about the PTXdist project and license conditions
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_BINUTILS) += binutils
#
# Paths and names
#
-BINUTILS_VERSION := 2.17
+BINUTILS_VERSION := $(shell $(CROSS_LD) -v | sed -e 's/.* \(.*\)$$/\1/g')
BINUTILS := binutils-$(BINUTILS_VERSION)
BINUTILS_SUFFIX := tar.bz2
BINUTILS_URL := $(PTXCONF_SETUP_GNUMIRROR)/binutils/$(BINUTILS).$(BINUTILS_SUFFIX)
@@ -113,7 +113,8 @@ binutils_targetinstall: $(STATEDIR)/binutils.targetinstall
$(STATEDIR)/binutils.targetinstall: $(binutils_targetinstall_deps_default)
@$(call targetinfo, $@)
- @$(call install_init, binutils)
+
+ @$(call install_init, binutils)
@$(call install_fixup, binutils,PACKAGE,binutils)
@$(call install_fixup, binutils,PRIORITY,optional)
@$(call install_fixup, binutils,VERSION,$(BINUTILS_VERSION))
@@ -122,15 +123,21 @@ $(STATEDIR)/binutils.targetinstall: $(binutils_targetinstall_deps_default)
@$(call install_fixup, binutils,DEPENDS,)
@$(call install_fixup, binutils,DESCRIPTION,missing)
- @$(call install_copy, binutils, 0, 0, 0755, $(BINUTILS_DIR)/binutils/.libs/objdump, \
- /usr/bin/objdump)
+ifdef PTXCONF_BINUTILS_READELF
+ @$(call install_copy, binutils, 0, 0, 0755, \
+ $(BINUTILS_DIR)/binutils/readelf, \
+ /usr/bin/readelf \
+ )
+endif
+ifdef PTXCONF_BINUTILS_OBJDUMP
+ @$(call install_copy, binutils, 0, 0, 0755, \
+ $(BINUTILS_DIR)/binutils/.libs/objdump, \
+ /usr/bin/objdump \
+ )
+endif
+ @$(call install_finish, binutils)
- @$(call install_copy, binutils, 0, 0, 0755, $(BINUTILS_DIR)/opcodes/.libs/libopcodes-2.17.so, /usr/lib/libopcodes-2.17.so )
- @$(call install_link, binutils, libopcodes-2.17.so, /usr/lib/libopcodes.so)
- @$(call install_copy, binutils, 0, 0, 0755, $(BINUTILS_DIR)/bfd/.libs/libbfd-2.17.so, /usr/lib/libbfd-2.17.so )
- @$(call install_link, binutils, libbfd-2.17.so, /usr/lib/libbfd.so)
- @$(call install_finish, binutils)
@$(call touch, $@)
# ----------------------------------------------------------------------------