Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/binutils/2.18/100-makeinfo-version.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Fri Apr 18 22:16:28 2008 +0000 (2008-04-18)
changeset 451 8a72f9bcf675
permissions -rw-r--r--
Using SOCKS 4/5 proxy is no easy task:
- a machine may well be able to reach the proxy, even if it is not on the same sub-net(s) as the machine itself (absolutely legitimate)
- tsocks.conf needs a list of so-called 'local' networks that can be reached without the need for a SOCKS connection
- SOCKS proxies are expected to be in 'local' networks
- there is absolutely NO way to tell what networks are local, besides the sub-net(s) the machine is in

Therefore, appropriate configuration of SOCKS 4/5 configuration is really complex, and attempts to correctly overcome this issue are doomed.

/trunk/scripts/crosstool.sh | 52 46 6 0 ++++++++++++++++++++++++++++++++++----
/trunk/config/global/download_extract.in | 39 31 8 0 +++++++++++++++++++++++------
2 files changed, 77 insertions(+), 14 deletions(-)
yann@406 
     1
 
diff -u binutils-2.18-orig/configure binutils-2.18/configure
yann@406 
     2
 
--- binutils-2.18-orig/configure	2007-08-06 16:29:40.000000000 -0400
yann@406 
     3
 
+++ binutils-2.18/configure	2007-09-27 22:41:51.000000000 -0400
yann@406 
     4
 
@@ -6125,10 +6125,10 @@
yann@406 
     5
 
   *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
yann@406 
     6
 
   *)
yann@406 
     7
yann@406 
     8
 
-    # For an installed makeinfo, we require it to be from texinfo 4.4 or
yann@406 
     9
 
+    # For an installed makeinfo, we require it to be from texinfo 4.6 or
yann@406 
    10
 
     # higher, else we use the "missing" dummy.
yann@406 
    11
 
     if ${MAKEINFO} --version \
yann@406 
    12
 
-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
yann@406 
    13
 
+       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
yann@406 
    14
 
       :
yann@406 
    15
 
     else
yann@406 
    16
 
       MAKEINFO="$MISSING makeinfo"
yann@406 
    17
 
diff -u binutils-2.18-orig/configure.ac binutils-2.18/configure.ac
yann@406 
    18
 
--- binutils-2.18-orig/configure.ac	2007-08-28 16:24:26.000000000 -0400
yann@406 
    19
 
+++ binutils-2.18/configure.ac	2007-09-27 22:41:00.000000000 -0400
yann@406 
    20
 
@@ -2400,10 +2400,10 @@
yann@406 
    21
 
   *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
yann@406 
    22
 
   *)
yann@406 
    23
 
 changequote(,)
yann@406 
    24
 
-    # For an installed makeinfo, we require it to be from texinfo 4.4 or
yann@406 
    25
 
+    # For an installed makeinfo, we require it to be from texinfo 4.6 or
yann@406 
    26
 
     # higher, else we use the "missing" dummy.
yann@406 
    27
 
     if ${MAKEINFO} --version \
yann@406 
    28
 
-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
yann@406 
    29
 
+       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
yann@406 
    30
 
       :
yann@406 
    31
 
     else
yann@406 
    32
 
       MAKEINFO="$MISSING makeinfo"
crosstool-ng