diff options
Diffstat (limited to 'data/grep')
| -rw-r--r-- | data/grep/make.sh | 7 | ||||
| -rw-r--r-- | data/grep/regcomp.diff | 19 |
2 files changed, 22 insertions, 4 deletions
diff --git a/data/grep/make.sh b/data/grep/make.sh index 6053ef5d6..a035be7ae 100644 --- a/data/grep/make.sh +++ b/data/grep/make.sh @@ -1,7 +1,6 @@ -tar -zxvf "${PKG_DATA}/grep-2.5.tar.gz" -cd grep-2.5 +pkg:extract +cd * pkg:patch -pkg:configure --disable-perl-regexp +pkg:configure --disable-perl-regexp --bindir=/bin make pkg:install -pkg:bin grep diff --git a/data/grep/regcomp.diff b/data/grep/regcomp.diff new file mode 100644 index 000000000..f4922f80d --- /dev/null +++ b/data/grep/regcomp.diff @@ -0,0 +1,19 @@ +diff -ru grep-2.5/lib/regex.c grep-2.5+iPhone/lib/regex.c +--- grep-2.5/lib/regex.c 2001-04-02 18:04:45.000000000 +0000 ++++ grep-2.5+iPhone/lib/regex.c 2008-04-05 05:18:34.000000000 +0000 +@@ -80,13 +80,13 @@ + # define PUT_CHAR(c) putchar (c) + #endif /* MBS_SUPPORT */ + +-#ifdef _LIBC +-/* We have to keep the namespace clean. */ + # define regfree(preg) __regfree (preg) + # define regexec(pr, st, nm, pm, ef) __regexec (pr, st, nm, pm, ef) + # define regcomp(preg, pattern, cflags) __regcomp (preg, pattern, cflags) + # define regerror(errcode, preg, errbuf, errbuf_size) \ + __regerror(errcode, preg, errbuf, errbuf_size) ++#ifdef _LIBC ++/* We have to keep the namespace clean. */ + # define re_set_registers(bu, re, nu, st, en) \ + __re_set_registers (bu, re, nu, st, en) + # define re_match_2(bufp, string1, size1, string2, size2, pos, regs, stop) \ |