diff options
| -rw-r--r-- | meta/packages/less/less-382/configure.patch | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/meta/packages/less/less-382/configure.patch b/meta/packages/less/less-382/configure.patch index 2f054ba639..9ae5bda7b8 100644 --- a/meta/packages/less/less-382/configure.patch +++ b/meta/packages/less/less-382/configure.patch | |||
| @@ -3,8 +3,14 @@ | |||
| 3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | 3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher |
| 4 | # | 4 | # |
| 5 | 5 | ||
| 6 | --- less-381/./configure.ac~configure | 6 | --- |
| 7 | +++ less-381/./configure.ac | 7 | configure.ac | 100 +++++++++++++++++++++-------------------------------------- |
| 8 | 1 file changed, 37 insertions(+), 63 deletions(-) | ||
| 9 | |||
| 10 | Index: less-382/configure.ac | ||
| 11 | =================================================================== | ||
| 12 | --- less-382.orig/configure.ac 2004-02-04 04:52:26.000000000 +0000 | ||
| 13 | +++ less-382/configure.ac 2007-03-26 23:35:29.000000000 +0100 | ||
| 8 | @@ -9,7 +9,7 @@ | 14 | @@ -9,7 +9,7 @@ |
| 9 | # contact the author, see the README file. | 15 | # contact the author, see the README file. |
| 10 | 16 | ||
| @@ -14,7 +20,7 @@ | |||
| 14 | AC_CONFIG_SRCDIR([forwback.c]) | 20 | AC_CONFIG_SRCDIR([forwback.c]) |
| 15 | AC_CONFIG_HEADER([defines.h]) | 21 | AC_CONFIG_HEADER([defines.h]) |
| 16 | 22 | ||
| 17 | @@ -56,8 +56,7 @@ | 23 | @@ -56,8 +56,7 @@ if test "x$TERMLIBS" = x; then |
| 18 | TERMLIBS="-lxcurses" | 24 | TERMLIBS="-lxcurses" |
| 19 | SAVE_LIBS=$LIBS | 25 | SAVE_LIBS=$LIBS |
| 20 | LIBS="$LIBS $TERMLIBS" | 26 | LIBS="$LIBS $TERMLIBS" |
| @@ -24,7 +30,7 @@ | |||
| 24 | LIBS=$SAVE_LIBS | 30 | LIBS=$SAVE_LIBS |
| 25 | if test $termok = no; then TERMLIBS=""; fi | 31 | if test $termok = no; then TERMLIBS=""; fi |
| 26 | fi | 32 | fi |
| 27 | @@ -69,8 +68,7 @@ | 33 | @@ -69,8 +68,7 @@ if test "x$TERMLIBS" = x; then |
| 28 | TERMLIBS="-lncurses" | 34 | TERMLIBS="-lncurses" |
| 29 | SAVE_LIBS=$LIBS | 35 | SAVE_LIBS=$LIBS |
| 30 | LIBS="$LIBS $TERMLIBS" | 36 | LIBS="$LIBS $TERMLIBS" |
| @@ -34,7 +40,7 @@ | |||
| 34 | LIBS=$SAVE_LIBS | 40 | LIBS=$SAVE_LIBS |
| 35 | if test $termok = no; then TERMLIBS=""; fi | 41 | if test $termok = no; then TERMLIBS=""; fi |
| 36 | fi | 42 | fi |
| 37 | @@ -82,8 +80,7 @@ | 43 | @@ -82,8 +80,7 @@ if test "x$TERMLIBS" = x; then |
| 38 | TERMLIBS="-lcurses" | 44 | TERMLIBS="-lcurses" |
| 39 | SAVE_LIBS=$LIBS | 45 | SAVE_LIBS=$LIBS |
| 40 | LIBS="$LIBS $TERMLIBS" | 46 | LIBS="$LIBS $TERMLIBS" |
| @@ -44,7 +50,7 @@ | |||
| 44 | LIBS=$SAVE_LIBS | 50 | LIBS=$SAVE_LIBS |
| 45 | if test $termok = no; then TERMLIBS=""; fi | 51 | if test $termok = no; then TERMLIBS=""; fi |
| 46 | fi | 52 | fi |
| 47 | @@ -96,8 +93,7 @@ | 53 | @@ -96,8 +93,7 @@ if test "x$TERMLIBS" = x; then |
| 48 | TERMLIBS="-lcurses -ltermcap" | 54 | TERMLIBS="-lcurses -ltermcap" |
| 49 | SAVE_LIBS=$LIBS | 55 | SAVE_LIBS=$LIBS |
| 50 | LIBS="$LIBS $TERMLIBS" | 56 | LIBS="$LIBS $TERMLIBS" |
| @@ -54,7 +60,7 @@ | |||
| 54 | LIBS=$SAVE_LIBS | 60 | LIBS=$SAVE_LIBS |
| 55 | if test $termok = no; then TERMLIBS=""; fi | 61 | if test $termok = no; then TERMLIBS=""; fi |
| 56 | fi | 62 | fi |
| 57 | @@ -111,8 +107,7 @@ | 63 | @@ -111,8 +107,7 @@ if test "x$TERMLIBS" = x; then |
| 58 | TERMLIBS="-ltermcap" | 64 | TERMLIBS="-ltermcap" |
| 59 | SAVE_LIBS=$LIBS | 65 | SAVE_LIBS=$LIBS |
| 60 | LIBS="$LIBS $TERMLIBS" | 66 | LIBS="$LIBS $TERMLIBS" |
| @@ -64,7 +70,7 @@ | |||
| 64 | LIBS=$SAVE_LIBS | 70 | LIBS=$SAVE_LIBS |
| 65 | if test $termok = no; then TERMLIBS=""; fi | 71 | if test $termok = no; then TERMLIBS=""; fi |
| 66 | fi | 72 | fi |
| 67 | @@ -124,8 +119,7 @@ | 73 | @@ -124,8 +119,7 @@ if test "x$TERMLIBS" = x; then |
| 68 | TERMLIBS="-lcurses -ltermlib" | 74 | TERMLIBS="-lcurses -ltermlib" |
| 69 | SAVE_LIBS=$LIBS | 75 | SAVE_LIBS=$LIBS |
| 70 | LIBS="$LIBS $TERMLIBS" | 76 | LIBS="$LIBS $TERMLIBS" |
| @@ -74,7 +80,7 @@ | |||
| 74 | LIBS=$SAVE_LIBS | 80 | LIBS=$SAVE_LIBS |
| 75 | if test $termok = no; then TERMLIBS=""; fi | 81 | if test $termok = no; then TERMLIBS=""; fi |
| 76 | fi | 82 | fi |
| 77 | @@ -200,14 +194,11 @@ | 83 | @@ -200,14 +194,11 @@ AH_TEMPLATE([EDIT_PGM], |
| 78 | # Checks for identifiers. | 84 | # Checks for identifiers. |
| 79 | AC_TYPE_OFF_T | 85 | AC_TYPE_OFF_T |
| 80 | AC_MSG_CHECKING(for void) | 86 | AC_MSG_CHECKING(for void) |
| @@ -92,7 +98,7 @@ | |||
| 92 | 98 | ||
| 93 | # Checks for library functions. | 99 | # Checks for library functions. |
| 94 | AC_TYPE_SIGNAL | 100 | AC_TYPE_SIGNAL |
| 95 | @@ -217,14 +208,13 @@ | 101 | @@ -217,14 +208,13 @@ AC_CHECK_FUNCS([fsync memcpy popen _setj |
| 96 | AC_CHECK_FUNC(tcgetattr, AC_DEFINE(HAVE_TERMIOS_FUNCS)) | 102 | AC_CHECK_FUNC(tcgetattr, AC_DEFINE(HAVE_TERMIOS_FUNCS)) |
| 97 | 103 | ||
| 98 | AC_MSG_CHECKING(for fileno) | 104 | AC_MSG_CHECKING(for fileno) |
| @@ -110,7 +116,7 @@ | |||
| 110 | #if HAVE_STDIO_H | 116 | #if HAVE_STDIO_H |
| 111 | #include <stdio.h> | 117 | #include <stdio.h> |
| 112 | #endif | 118 | #endif |
| 113 | @@ -233,68 +223,56 @@ | 119 | @@ -233,68 +223,56 @@ AC_TRY_LINK([ |
| 114 | #endif | 120 | #endif |
| 115 | #if HAVE_ERRNO_H | 121 | #if HAVE_ERRNO_H |
| 116 | #include <errno.h> | 122 | #include <errno.h> |
| @@ -196,7 +202,7 @@ | |||
| 196 | fi | 202 | fi |
| 197 | 203 | ||
| 198 | # Checks for regular expression functions. | 204 | # Checks for regular expression functions. |
| 199 | @@ -311,7 +289,7 @@ | 205 | @@ -311,7 +289,7 @@ if test $have_regex = no; then |
| 200 | if test $WANT_REGEX = auto -o $WANT_REGEX = posix; then | 206 | if test $WANT_REGEX = auto -o $WANT_REGEX = posix; then |
| 201 | # Some versions of Solaris have a regcomp() function, but it doesn't work! | 207 | # Some versions of Solaris have a regcomp() function, but it doesn't work! |
| 202 | # So we run a test program. If we're cross-compiling, do it the old way. | 208 | # So we run a test program. If we're cross-compiling, do it the old way. |
| @@ -205,7 +211,7 @@ | |||
| 205 | #include <sys/types.h> | 211 | #include <sys/types.h> |
| 206 | #include <regex.h> | 212 | #include <regex.h> |
| 207 | main() { regex_t r; regmatch_t rm; char *text = "xabcy"; | 213 | main() { regex_t r; regmatch_t rm; char *text = "xabcy"; |
| 208 | @@ -322,19 +300,16 @@ | 214 | @@ -322,19 +300,16 @@ if (rm.rm_so != 1) exit(1); /* check for |
| 209 | #else | 215 | #else |
| 210 | if (rm.rm_sp != text + 1) exit(1); /* check for correct offset */ | 216 | if (rm.rm_sp != text + 1) exit(1); /* check for correct offset */ |
| 211 | #endif | 217 | #endif |
| @@ -229,7 +235,7 @@ | |||
| 229 | else | 235 | else |
| 230 | AC_MSG_RESULT(no) | 236 | AC_MSG_RESULT(no) |
| 231 | fi | 237 | fi |
| 232 | @@ -357,9 +332,8 @@ | 238 | @@ -357,9 +332,8 @@ fi |
| 233 | 239 | ||
| 234 | if test $have_regex = no; then | 240 | if test $have_regex = no; then |
| 235 | if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp; then | 241 | if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp; then |
