[packages_10.03.2] binutils: merge r28130, r28640
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 5 Feb 2012 03:21:39 +0000 (03:21 +0000)
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 5 Feb 2012 03:21:39 +0000 (03:21 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30170 3c298f89-4303-0410-b956-a3cf2f4a3e73

devel/binutils/Makefile

index 5925fdd..50580e4 100644 (file)
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=binutils
 PKG_VERSION:=$(strip $(subst ",, $(CONFIG_BINUTILS_VERSION)))
 #"))
-PKG_RELEASE:=3
+PKG_RELEASE:=5
 
 PKG_SOURCE_URL:=@GNU/binutils
 PKG_SOURCE:=binutils-$(PKG_VERSION).tar.bz2
@@ -47,7 +47,6 @@ CONFIGURE_ARGS = \
                --target=$(REAL_GNU_TARGET_NAME) \
                --host=$(REAL_GNU_TARGET_NAME) \
                --build=$(GNU_HOST_NAME) \
-               --with-sysroot=$(PKG_INSTALL_DIR) \
                --prefix=/usr \
                --disable-multilib \
                --disable-werror \
@@ -72,7 +71,7 @@ define Build/Configure
                configure-libiberty \
                configure-opcodes \
        )
-       $(MAKE) CFLAGS="$(TARGET_CFLAGS)"-C $(PKG_BUILD_DIR)/bfd/po Makefile
+       $(MAKE) CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR)/bfd/po Makefile
 endef
 
 define Build/InstallDev
@@ -102,8 +101,9 @@ define Package/objdump/install
 endef
 
 define Package/binutils/install
-       $(INSTALL_DIR) $(1)/usr
+       $(INSTALL_DIR) $(1)/usr $(1)/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/ $(1)/usr/
+       mv $(1)/usr/bin/strings $(1)/bin/strings
        rm -f $(1)/usr/bin/objdump
 endef