Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/binutils/2.21.1a/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>
yann@2665 
     1
 
diff -durN binutils-2.21.1.orig/ld/Makefile.am binutils-2.21.1/ld/Makefile.am
yann@2665 
     2
 
--- binutils-2.21.1.orig/ld/Makefile.am	2011-03-16 09:37:30.000000000 +0100
yann@2665 
     3
 
+++ binutils-2.21.1/ld/Makefile.am	2011-09-12 13:39:07.962244866 +0200
yann@2665 
     4
 
@@ -37,7 +37,7 @@
yann@2665 
     5
 
 # We put the scripts in the directory $(scriptdir)/ldscripts.
yann@2665 
     6
 
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
yann@2665 
     7
 
 # directives need to be different for native and cross linkers.
yann@2665 
     8
 
-scriptdir = $(tooldir)/lib
yann@2665 
     9
 
+scriptdir = $(libdir)
yann@2665 
    10
yann@2665 
    11
 
 EMUL = @EMUL@
yann@2665 
    12
 
 EMULATION_OFILES = @EMULATION_OFILES@
yann@2665 
    13
 
diff -durN binutils-2.21.1.orig/ld/Makefile.in binutils-2.21.1/ld/Makefile.in
yann@2665 
    14
 
--- binutils-2.21.1.orig/ld/Makefile.in	2011-03-16 09:37:30.000000000 +0100
yann@2665 
    15
 
+++ binutils-2.21.1/ld/Makefile.in	2011-09-12 13:39:07.962244866 +0200
yann@2665 
    16
 
@@ -365,7 +365,7 @@
yann@2665 
    17
 
 # We put the scripts in the directory $(scriptdir)/ldscripts.
yann@2665 
    18
 
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
yann@2665 
    19
 
 # directives need to be different for native and cross linkers.
yann@2665 
    20
 
-scriptdir = $(tooldir)/lib
yann@2665 
    21
 
+scriptdir = $(libdir)
yann@2665 
    22
 
 BASEDIR = $(srcdir)/..
yann@2665 
    23
 
 BFDDIR = $(BASEDIR)/bfd
yann@2665 
    24
 
 INCDIR = $(BASEDIR)/include
crosstool-ng