From ea31afdf04dd524ab57e8f8fb6c515fcc45bafbe Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 22 Jul 2009 20:42:23 +0200
Subject: Require GNU awk at ./configure time.

Some components (specifically {,e}glibc) will not build when awk
is not GNU awk. Make ./configure check for GNU awk.

diff --git a/configure b/configure
index a1eef74..4770422 100755
--- a/configure
+++ b/configure
@@ -327,7 +327,7 @@ has_or_abort prog=make                                  \
              ver='^GNU Make (3.[89][[:digit:]]|[4-9])'  \
              err="GNU 'make' 3.80 or above was not found"
 has_or_abort prog=gcc
-has_or_abort prog=awk
+has_or_abort prog="awk gawk" ver='^GNU Awk' err="GNU 'awk' was not found"
 has_or_abort prog=bison
 has_or_abort prog=flex
 has_or_abort prog=makeinfo
-- 
cgit v0.10.2-6-g49f6


From c0483fc7ec4a0b6ecfaa3d8b5ccc27a8a2a11fde Mon Sep 17 00:00:00 2001
From: "Oron Peled\"" <oron@actcom.co.il>
Date: Sat, 1 Aug 2009 19:18:12 +0200
Subject: [configure] Fix automake version check.

The configure script fails on automake-1.11 (in Fedora-11) since
it looks for 3-digit version number.

Patch fixed by "Yann E. MORIN", with the added comment:

The check for the automake version is not against a 3-digit number,
but really against a 3-part version number, a-la 'x.y.z'. Versions
such as 1.10 and 1.11 are also valid.

diff --git a/configure b/configure
index 4770422..71787a4 100755
--- a/configure
+++ b/configure
@@ -332,7 +332,7 @@ has_or_abort prog=bison
 has_or_abort prog=flex
 has_or_abort prog=makeinfo
 has_or_abort prog=automake                                                      \
-             ver='\(GNU automake\) (1\.[[:digit:]]{2,}\.|[2-9][[:digit:]]*\.)'  \
+             ver='\(GNU automake\) (1\.[[:digit:]]{2,}|[2-9][[:digit:]]*\.)'    \
              err="'automake' 1.10 or above was not found"
 has_or_abort prog=libtool                                                                           \
              ver='\(GNU libtool.*\) (2[[:digit:]]*\.|1\.6[[:digit:]]*\.|1\.5\.[2-9][[:digit:]]+)'   \
-- 
cgit v0.10.2-6-g49f6


From a183b3f8bcdafe722a6232b9ea10c4951d6e588e Mon Sep 17 00:00:00 2001
From: "Bart vdr. Meulen" <bartvdrmeulen@gmail.com>
Date: Sun, 2 Aug 2009 16:45:33 +0200
Subject: Add g++ to required tools

Because gmp is now always build with --enable-cxx,
g++ has become a required tool

Signed-off-by: Bart vdr Meulen <bartvdrmeulen@gmail.com>

---

diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index 36c77ba..6382c0a 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -405,7 +405,7 @@ if [ -z "${CT_RESTART}" ]; then
             else
                 case "${tool}" in
                     # We'll at least need some of them...
-                    ar|as|gcc|ld|nm|objcopy|objdump|ranlib)
+                    ar|as|gcc|g++|ld|nm|objcopy|objdump|ranlib)
                         CT_Abort "Missing: '${t}${tool}${!s}' or '${t}${tool}' or '${tool}' : either needed!"
                         ;;
                     # Some are conditionnally required
-- 
cgit v0.10.2-6-g49f6


From 7c3dcb42dc4d7f2e3adeb40f954ee94ef1afa7ee Mon Sep 17 00:00:00 2001
From: "Bart vdr. Meulen" <bartvdrmeulen@gmail.com>
Date: Sun, 2 Aug 2009 16:45:43 +0200
Subject: fix wrapper script for symlinks

The wrapper script placed around the target binaries when
using the companion libraries does not work for symbolic links
The wrapper scripts needs to follow the links before calling the
actual binary

Signed-off-by: Bart vdr. Meulen <bartvdrmeulen@gmail.com>

---

diff --git a/scripts/wrapper.in b/scripts/wrapper.in
index 6222333..1c501eb 100644
--- a/scripts/wrapper.in
+++ b/scripts/wrapper.in
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-dirname="$(dirname "${0}")"
-basename="$(basename "${0}")"
+canonicalizedname=$(readlink -nm "${0}")
+dirname="$(dirname "${canonicalizedname}")"
+basename="$(basename "${canonicalizedname}")"
 
 ld_lib_path="$(dirname "${dirname}")/lib"
 
-- 
cgit v0.10.2-6-g49f6