X-Git-Url: http://git.archive.openwrt.org/?p=packages.git;a=blobdiff_plain;f=devel%2Fbinutils%2FMakefile;h=fc07eda7067689349bb393de9bbae06b08aaea92;hp=dcd76d41ca5af54bd6c97bdfa377a245a4bdec04;hb=ca74ca9b86f4b2b5813b3f5812f66c22a240b959;hpb=587347c6d52b17dbc75f1214e6289f74fa468367

diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index dcd76d41c..fc07eda70 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -1,26 +1,30 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=binutils
 PKG_VERSION:=$(strip $(subst ",, $(CONFIG_BINUTILS_VERSION)))
 #"))
-PKG_RELEASE:=1
-PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/binutils/ \
-	ftp://gatekeeper.dec.com/pub/GNU/ \
-		ftp://ftp.uu.net/archive/systems/gnu/ \
-		ftp://ftp.eu.uu.net/pub/gnu/ \
-		ftp://ftp.funet.fi/pub/gnu/prep/ \
-		ftp://ftp.leo.org/pub/comp/os/unix/gnu/
+PKG_RELEASE:=5
 
+PKG_SOURCE_URL:=@GNU/binutils
 PKG_SOURCE:=binutils-$(PKG_VERSION).tar.bz2
+PKG_MD5SUM:=
+
 PATCH_DIR:=$(TOPDIR)/toolchain/binutils/patches/$(PKG_VERSION)
+
+PKG_FIXUP:=autoreconf
+PKG_LIBTOOL_PATHS:=. gas bfd opcodes gprof binutils ld libiberty gold intl
+PKG_REMOVE_FILES:=libtool.m4
 PKG_INSTALL:=1
 
+PKG_BUILD_PARALLEL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/binutils
@@ -34,57 +38,76 @@ define Package/objdump
   SECTION:=devel
   CATEGORY:=Development
   TITLE:=objdump
-  DEPENDS:=+zlib
+  DEPENDS:=+zlib 
 endef
 
 define Package/binutils/description
   The Binutils package contains a linker, an assembler, and other tools for handling object files
 endef
 
-define Package/libbfd
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=libbfd
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
+CONFIGURE_ARGS = \
+		--target=$(REAL_GNU_TARGET_NAME) \
+		--host=$(REAL_GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--prefix=/usr \
+		--disable-multilib \
 		--disable-werror \
 		--disable-nls \
+		--enable-shared \
+		$(SOFT_FLOAT_CONFIG_OPTION) \
+		$(call qstrip,$(CONFIG_EXTRA_BINUTILS_CONFIG_OPTIONS))
+
+TARGET_CFLAGS += $(FPIC)
+TARGET_LDFLAGS := -L$(PKG_BUILD_DIR)/libiberty $(TARGET_LDFLAGS)
+
+define Build/Configure
+	$(call Build/Configure/Default)
+	$(call Build/Compile/Default, \
+		configure-bfd \
+		configure-binutils \
+		configure-etc \
+		configure-gas \
+		configure-gprof \
+		configure-intl \
+		configure-ld \
+		configure-libiberty \
+		configure-opcodes \
 	)
+	$(MAKE) CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR)/bfd/po Makefile
 endef
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/{lib,include}
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/libbfd.a \
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/* \
 		$(1)/usr/lib/
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/include/{symcat,ansidecl,bfd,bfdlink}.h \
+	$(CP) \
+		$(PKG_BUILD_DIR)/include/*.h \
 		$(1)/usr/include/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/include/* \
+		$(1)/usr/include/
+	rm -f $(1)/usr/include/gdbm.h
 endef
 
 define Build/Compile
-	make -C $(PKG_BUILD_DIR)/bfd/doc/ CFLAGS="-I$(PKG_BUILD_DIR)/include" chew
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/bfd/doc/ CFLAGS="-I$(PKG_BUILD_DIR)/include" chew
 	$(call Build/Compile/Default)
 endef
 
 define Package/objdump/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/*-linux/bin/objdump $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/objdump $(1)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libopcodes*.so $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libbfd*.so $(1)/usr/lib/
 endef
 
 define Package/binutils/install
-	$(INSTALL_DIR) $(1)/usr
+	$(INSTALL_DIR) $(1)/usr $(1)/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ $(1)/usr/
-	$(CP) $(PKG_INSTALL_DIR)/usr/*-linux $(1)/usr
+	mv $(1)/usr/bin/strings $(1)/bin/strings
 	rm -f $(1)/usr/bin/objdump
 endef
 
-define Package/libbdf/install
-    true
-endef
-
 $(eval $(call BuildPackage,binutils))
 $(eval $(call BuildPackage,objdump))
-$(eval $(call BuildPackage,libbfd))