patches/binutils/2.22/300-001_ld_makefile_patch.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Oct 16 20:57:44 2012 +0200 (2012-10-16)
changeset 3079 37831a33e07e
permissions -rw-r--r--
kernel/linux: fix using custom location

Currently, extract and patch are skipped as thus:
- using a custom directory of pre-installed headers
- a correctly named directory already exists

Otherwise, extract and patch are done.

The current second condition is wrong, because it allows the following
sequence to happen:
- a non-custom kernel is used
- a previous build only partially extracted the non-custom sources
- that p[revious build broke during extraction (eg. incomplete tarball...)
- a subsequent build will find a properly named directory, and will
thus skip extract and patch, which is wrong

Fix that by following the conditions in this table:

Type | Extract | Patch
----------------------+---------+-------
Pre-installed headers | N | N
custom directory | N | N
custom tarball | Y | N
mainstream tarball | Y | Y

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: David Holsgrove <david.holsgrove@xilinx.com>
benoit@2810
     1
diff -durN binutils-2.22.orig/ld/Makefile.am binutils-2.22/ld/Makefile.am
benoit@2810
     2
--- binutils-2.22.orig/ld/Makefile.am	2011-07-22 22:22:37.000000000 +0200
benoit@2810
     3
+++ binutils-2.22/ld/Makefile.am	2011-12-14 19:50:25.760779164 +0100
benoit@2810
     4
@@ -37,7 +37,7 @@
benoit@2810
     5
 # We put the scripts in the directory $(scriptdir)/ldscripts.
benoit@2810
     6
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
benoit@2810
     7
 # directives need to be different for native and cross linkers.
benoit@2810
     8
-scriptdir = $(tooldir)/lib
benoit@2810
     9
+scriptdir = $(libdir)
benoit@2810
    10
 
benoit@2810
    11
 EMUL = @EMUL@
benoit@2810
    12
 EMULATION_OFILES = @EMULATION_OFILES@
benoit@2810
    13
diff -durN binutils-2.22.orig/ld/Makefile.in binutils-2.22/ld/Makefile.in
benoit@2810
    14
--- binutils-2.22.orig/ld/Makefile.in	2011-07-22 22:22:37.000000000 +0200
benoit@2810
    15
+++ binutils-2.22/ld/Makefile.in	2011-12-14 19:50:25.784779163 +0100
benoit@2810
    16
@@ -366,7 +366,7 @@
benoit@2810
    17
 # We put the scripts in the directory $(scriptdir)/ldscripts.
benoit@2810
    18
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
benoit@2810
    19
 # directives need to be different for native and cross linkers.
benoit@2810
    20
-scriptdir = $(tooldir)/lib
benoit@2810
    21
+scriptdir = $(libdir)
benoit@2810
    22
 BASEDIR = $(srcdir)/..
benoit@2810
    23
 BFDDIR = $(BASEDIR)/bfd
benoit@2810
    24
 INCDIR = $(BASEDIR)/include