[generic] fix layer7 patches for Kernels >= 2.6.35, thanks Daniel Gimpelevich

[openwrt.git] / toolchain / binutils / Makefile

diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 91d982c..7a19d12 100644 (file)
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -13,9 +13,6 @@ BIN_VERSION:=$(PKG_VERSION)
 PKG_SOURCE_URL:=@GNU/binutils/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
 PKG_SOURCE_URL:=@GNU/binutils/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 

-ifeq ($(PKG_VERSION),2.18)
-  PKG_MD5SUM:=9d22ee4dafa3a194457caf4706f9cf01
-endif

 ifeq ($(PKG_VERSION),2.19.1)
   PKG_MD5SUM:=09a8c5821a2dfdbb20665bc0bd680791
 endif
 ifeq ($(PKG_VERSION),2.19.1)
   PKG_MD5SUM:=09a8c5821a2dfdbb20665bc0bd680791
 endif


@@ -26,8 +23,8 @@ ifeq ($(PKG_VERSION),2.19.1+cs)
   PKG_MD5SUM:=040740e8c864dd1a15886753f9c0bc0b
   HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/binutils-$(BIN_VERSION)
 endif
   PKG_MD5SUM:=040740e8c864dd1a15886753f9c0bc0b
   HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/binutils-$(BIN_VERSION)
 endif

-ifeq ($(PKG_VERSION),2.20)
-  PKG_MD5SUM:=ee2d3e996e9a2d669808713360fa96f8
+ifeq ($(PKG_VERSION),2.20.1)
+  PKG_MD5SUM:=9cdfb9d6ec0578c166d3beae5e15c4e5

 endif
 
 PATCH_DIR:=./patches/$(PKG_VERSION)
 endif
 
 PATCH_DIR:=./patches/$(PKG_VERSION)


@@ -38,7 +35,7 @@ include $(INCLUDE_DIR)/toolchain-build.mk
 
 BINUTILS_CONFIGURE:= \
        ./configure \
 
 BINUTILS_CONFIGURE:= \
        ./configure \

-               --prefix=$(TOOLCHAIN_DIR)/usr \
+               --prefix=$(TOOLCHAIN_DIR) \

                --build=$(GNU_HOST_NAME) \
                --host=$(GNU_HOST_NAME) \
                --target=$(REAL_GNU_TARGET_NAME) \
                --build=$(GNU_HOST_NAME) \
                --host=$(GNU_HOST_NAME) \
                --target=$(REAL_GNU_TARGET_NAME) \


@@ -46,12 +43,9 @@ BINUTILS_CONFIGURE:= \
                --disable-multilib \
                --disable-werror \
                --disable-nls \
                --disable-multilib \
                --disable-werror \
                --disable-nls \

-               $(if $(CONFIG_GCC_VERSION_4_4), \
-                 --with-ppl=$(REAL_STAGING_DIR_HOST) \
-                 --with-cloog=$(REAL_STAGING_DIR_HOST) \
-               ) \
+               $(GRAPHITE_CONFIGURE) \

                $(SOFT_FLOAT_CONFIG_OPTION) \
                $(SOFT_FLOAT_CONFIG_OPTION) \

-               $(call qstrip,$(CONFIG_EXTRA_BINUTILS_CONFIG_OPTIONS)) \
+               $(call qstrip,$(CONFIG_EXTRA_BINUTILS_CONFIG_OPTIONS)) 

 
 ifneq ($(CONFIG_SSP_SUPPORT),)
   BINUTILS_CONFIGURE+= \
 
 ifneq ($(CONFIG_SSP_SUPPORT),)
   BINUTILS_CONFIGURE+= \


@@ -79,12 +73,12 @@ define Host/Configure
 endef
 
 define Host/Compile
 endef
 
 define Host/Compile

-       $(MAKE) -C $(HOST_BUILD_DIR) all
+       $(MAKE) $(TOOLCHAIN_JOBS) -C $(HOST_BUILD_DIR) all

 endef
 
 define Host/Install
        $(MAKE) -C $(HOST_BUILD_DIR) install
 endef
 
 define Host/Install
        $(MAKE) -C $(HOST_BUILD_DIR) install

-       $(CP) $(TOOLCHAIN_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-readelf $(REAL_STAGING_DIR_HOST)/bin/readelf
+       $(CP) $(TOOLCHAIN_DIR)/bin/$(REAL_GNU_TARGET_NAME)-readelf $(REAL_STAGING_DIR_HOST)/bin/readelf

 endef
 
 define Host/Clean
 endef
 
 define Host/Clean