diff --git a/package/base/dietlibc/pkg_patch/pkg_gawk.patch b/package/base/dietlibc/pkg_patch/pkg_gawk.patch index f7972d6ea..0c6d510a4 100644 --- a/package/base/dietlibc/pkg_patch/pkg_gawk.patch +++ b/package/base/dietlibc/pkg_patch/pkg_gawk.patch @@ -1,64 +1,7 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/dietlibc/pkg_patch/pkg_gawk.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./configure.orig 2003-07-28 10:26:06.000000000 +0200 -+++ ./configure 2003-07-28 10:28:01.000000000 +0200 -@@ -12,6 +12,11 @@ - ## M4sh Initialization. ## - ## --------------------- ## - -+ac_cv_header_mcheck_h=no -+ac_cv_header_stropts_h=no -+ac_cv_header_wchar_h=no -+ac_cv_header_wctype_h=no -+ - # Be Bourne compatible - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh -@@ -10821,9 +10826,9 @@ - fi - if test $ac_cv_header_dlfcn_h = yes; then - --cat >>confdefs.h <<\_ACEOF --#define DYNAMIC 1 --_ACEOF -+# cat >>confdefs.h <<\_ACEOF -+# #define DYNAMIC 1 -+# _ACEOF - - if test "$GCC" = yes - then - - -This part disables the useage of math.h functions since dietlibs only support -them correctly for x86. - -This is a ugly hack which return 0.0 for all such function - and we should -consider working on fixing dietlibc in this regard. - - - Rene Rebe - - -diff -ur gawk-3.1.3/builtin.c gawk-3.1.3-hacked/builtin.c ---- gawk-3.1.3/builtin.c 2003-07-07 00:08:08.000000000 +0200 -+++ gawk-3.1.3-hacked/builtin.c 2003-09-07 20:48:44.000000000 +0200 -@@ -153,7 +153,7 @@ +diff -dur gawk-3.1.5/builtin.c gawk-3.1.5-p/builtin.c +--- gawk-3.1.5/builtin.c 2005-07-26 20:07:43.000000000 +0200 ++++ gawk-3.1.5-p/builtin.c 2006-05-30 21:53:45.000000000 +0200 +@@ -161,7 +161,7 @@ d = force_number(tmp); free_temp(tmp); errno = 0; @@ -67,7 +10,7 @@ diff -ur gawk-3.1.3/builtin.c gawk-3.1.3-hacked/builtin.c if (errno == ERANGE) warning(_("exp: argument %g is out of range"), d); return tmp_number((AWKNUM) res); -@@ -418,9 +418,9 @@ +@@ -430,9 +430,9 @@ double_to_int(double d) { if (d >= 0) @@ -79,7 +22,7 @@ diff -ur gawk-3.1.3/builtin.c gawk-3.1.3-hacked/builtin.c return d; } -@@ -471,7 +471,7 @@ +@@ -507,7 +507,7 @@ arg = (double) force_number(tmp); if (arg < 0.0) warning(_("log: received negative argument %g"), arg); @@ -88,7 +31,7 @@ diff -ur gawk-3.1.3/builtin.c gawk-3.1.3-hacked/builtin.c free_temp(tmp); return tmp_number((AWKNUM) d); } -@@ -1213,7 +1213,7 @@ +@@ -1303,7 +1303,7 @@ free_temp(tmp); if (arg < 0.0) warning(_("sqrt: called with negative argument %g"), arg); @@ -97,7 +40,7 @@ diff -ur gawk-3.1.3/builtin.c gawk-3.1.3-hacked/builtin.c } /* do_substr --- do the substr function */ -@@ -1707,7 +1707,7 @@ +@@ -1895,7 +1895,7 @@ d2 = force_number(t2); free_temp(t1); free_temp(t2); @@ -106,7 +49,7 @@ diff -ur gawk-3.1.3/builtin.c gawk-3.1.3-hacked/builtin.c } /* do_sin --- do the sin function */ -@@ -1721,7 +1721,7 @@ +@@ -1909,7 +1909,7 @@ tmp = tree_eval(tree->lnode); if (do_lint && (tmp->flags & (NUMCUR|NUMBER)) == 0) lintwarn(_("sin: received non-numeric argument")); @@ -115,7 +58,7 @@ diff -ur gawk-3.1.3/builtin.c gawk-3.1.3-hacked/builtin.c free_temp(tmp); return tmp_number((AWKNUM) d); } -@@ -1737,7 +1737,7 @@ +@@ -1925,7 +1925,7 @@ tmp = tree_eval(tree->lnode); if (do_lint && (tmp->flags & (NUMCUR|NUMBER)) == 0) lintwarn(_("cos: received non-numeric argument")); @@ -124,19 +67,19 @@ diff -ur gawk-3.1.3/builtin.c gawk-3.1.3-hacked/builtin.c free_temp(tmp); return tmp_number((AWKNUM) d); } -diff -ur gawk-3.1.3/eval.c gawk-3.1.3-hacked/eval.c ---- gawk-3.1.3/eval.c 2003-06-22 10:56:04.000000000 +0200 -+++ gawk-3.1.3-hacked/eval.c 2003-09-07 20:53:06.000000000 +0200 -@@ -1111,7 +1111,7 @@ - x *= x1; - } - } else -- x = pow((double) x1, (double) x2); -+ x = 0.0; /* pow((double) x1, (double) x2); */ - return tmp_number(x); +diff -dur gawk-3.1.5/eval.c gawk-3.1.5-p/eval.c +--- gawk-3.1.5/eval.c 2005-07-26 20:07:43.000000000 +0200 ++++ gawk-3.1.5-p/eval.c 2006-05-30 22:11:27.000000000 +0200 +@@ -914,7 +914,7 @@ + return (lx > 0) ? calc_exp_posint(x1, lx) + : 1.0 / calc_exp_posint(x1, -lx); + } +- return (AWKNUM) pow((double) x1, (double) x2); ++ return (AWKNUM) 0.0; /* pow((double) x1, (double) x2); */ + } - case Node_times: -@@ -1138,8 +1138,8 @@ + /* r_tree_eval --- evaluate a subtree */ +@@ -1294,8 +1294,8 @@ #ifdef HAVE_FMOD return tmp_number(fmod(x1, x2)); #else /* ! HAVE_FMOD */ @@ -147,23 +90,14 @@ diff -ur gawk-3.1.3/eval.c gawk-3.1.3-hacked/eval.c #endif /* ! HAVE_FMOD */ case Node_plus: -@@ -1316,7 +1316,7 @@ - *lhs = make_number(t1); - } - } else -- *lhs = make_number((AWKNUM) pow((double) lval, (double) rval)); -+ *lhs = make_number((AWKNUM) 0.0 /* pow((double) lval, (double) rval)*/); - break; +@@ -1497,8 +1497,8 @@ + { + AWKNUM t1, t2; - case Node_assign_times: -@@ -1347,8 +1347,8 @@ - #ifdef HAVE_FMOD - *lhs = make_number(fmod(lval, rval)); - #else /* ! HAVE_FMOD */ - (void) modf(lval / rval, &t1); - t2 = lval - rval * t1; -+ /*(void) modf(lval / rval, &t1);*/ -+ t2 = 0.0; /* lval - rval * t1; */ ++ /* (void) modf(lval / rval, &t1); */ ++ t2 = 0.0 /* lval - rval * t1; */ *lhs = make_number(t2); + } #endif /* ! HAVE_FMOD */ - break;