summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/packages/less/less-382/configure.patch249
-rw-r--r--meta/packages/less/less_406.bb (renamed from meta/packages/less/less_382.bb)4
2 files changed, 1 insertions, 252 deletions
diff --git a/meta/packages/less/less-382/configure.patch b/meta/packages/less/less-382/configure.patch
deleted file mode 100644
index 9ae5bda7b8..0000000000
--- a/meta/packages/less/less-382/configure.patch
+++ /dev/null
@@ -1,249 +0,0 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6---
7 configure.ac | 100 +++++++++++++++++++++--------------------------------------
8 1 file changed, 37 insertions(+), 63 deletions(-)
9
10Index: 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
14@@ -9,7 +9,7 @@
15 # contact the author, see the README file.
16
17 # Autoconf initialization.
18-AC_INIT(less, 1)
19+AC_INIT([less],[1])
20 AC_CONFIG_SRCDIR([forwback.c])
21 AC_CONFIG_HEADER([defines.h])
22
23@@ -56,8 +56,7 @@ if test "x$TERMLIBS" = x; then
24 TERMLIBS="-lxcurses"
25 SAVE_LIBS=$LIBS
26 LIBS="$LIBS $TERMLIBS"
27- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
28- [termok=yes], [termok=no])
29+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no])
30 LIBS=$SAVE_LIBS
31 if test $termok = no; then TERMLIBS=""; fi
32 fi
33@@ -69,8 +68,7 @@ if test "x$TERMLIBS" = x; then
34 TERMLIBS="-lncurses"
35 SAVE_LIBS=$LIBS
36 LIBS="$LIBS $TERMLIBS"
37- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
38- [termok=yes], [termok=no])
39+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no])
40 LIBS=$SAVE_LIBS
41 if test $termok = no; then TERMLIBS=""; fi
42 fi
43@@ -82,8 +80,7 @@ if test "x$TERMLIBS" = x; then
44 TERMLIBS="-lcurses"
45 SAVE_LIBS=$LIBS
46 LIBS="$LIBS $TERMLIBS"
47- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
48- [termok=yes], [termok=no])
49+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no])
50 LIBS=$SAVE_LIBS
51 if test $termok = no; then TERMLIBS=""; fi
52 fi
53@@ -96,8 +93,7 @@ if test "x$TERMLIBS" = x; then
54 TERMLIBS="-lcurses -ltermcap"
55 SAVE_LIBS=$LIBS
56 LIBS="$LIBS $TERMLIBS"
57- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
58- [termok=yes], [termok=no])
59+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no])
60 LIBS=$SAVE_LIBS
61 if test $termok = no; then TERMLIBS=""; fi
62 fi
63@@ -111,8 +107,7 @@ if test "x$TERMLIBS" = x; then
64 TERMLIBS="-ltermcap"
65 SAVE_LIBS=$LIBS
66 LIBS="$LIBS $TERMLIBS"
67- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
68- [termok=yes], [termok=no])
69+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no])
70 LIBS=$SAVE_LIBS
71 if test $termok = no; then TERMLIBS=""; fi
72 fi
73@@ -124,8 +119,7 @@ if test "x$TERMLIBS" = x; then
74 TERMLIBS="-lcurses -ltermlib"
75 SAVE_LIBS=$LIBS
76 LIBS="$LIBS $TERMLIBS"
77- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
78- [termok=yes], [termok=no])
79+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no])
80 LIBS=$SAVE_LIBS
81 if test $termok = no; then TERMLIBS=""; fi
82 fi
83@@ -200,14 +194,11 @@ AH_TEMPLATE([EDIT_PGM],
84 # Checks for identifiers.
85 AC_TYPE_OFF_T
86 AC_MSG_CHECKING(for void)
87-AC_TRY_COMPILE(, [void *foo = 0;],
88- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_VOID)], [AC_MSG_RESULT(no)])
89+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void *foo = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_VOID)],[AC_MSG_RESULT(no)])
90 AC_MSG_CHECKING(for const)
91-AC_TRY_COMPILE(, [const int foo = 0;],
92- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CONST)], [AC_MSG_RESULT(no)])
93+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[const int foo = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CONST)],[AC_MSG_RESULT(no)])
94 AC_MSG_CHECKING(for time_t)
95-AC_TRY_COMPILE([#include <time.h>], [time_t t = 0;],
96- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TIME_T)], [AC_MSG_RESULT(no)])
97+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[time_t t = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TIME_T)],[AC_MSG_RESULT(no)])
98
99 # Checks for library functions.
100 AC_TYPE_SIGNAL
101@@ -217,14 +208,13 @@ AC_CHECK_FUNCS([fsync memcpy popen _setj
102 AC_CHECK_FUNC(tcgetattr, AC_DEFINE(HAVE_TERMIOS_FUNCS))
103
104 AC_MSG_CHECKING(for fileno)
105-AC_TRY_LINK([
106+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
107 #if HAVE_STDIO_H
108 #include <stdio.h>
109-#endif], [static int x; x = fileno(stdin);],
110- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FILENO)], [AC_MSG_RESULT(no)])
111+#endif]], [[static int x; x = fileno(stdin);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FILENO)],[AC_MSG_RESULT(no)])
112
113 AC_MSG_CHECKING(for strerror)
114-AC_TRY_LINK([
115+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
116 #if HAVE_STDIO_H
117 #include <stdio.h>
118 #endif
119@@ -233,68 +223,56 @@ AC_TRY_LINK([
120 #endif
121 #if HAVE_ERRNO_H
122 #include <errno.h>
123-#endif], [static char *x; x = strerror(0);],
124- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STRERROR)], [AC_MSG_RESULT(no)])
125+#endif]], [[static char *x; x = strerror(0);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STRERROR)],[AC_MSG_RESULT(no)])
126
127 AC_MSG_CHECKING(for sys_errlist)
128-AC_TRY_LINK(, [extern char *sys_errlist[]; static char **x; x = sys_errlist;],
129- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYS_ERRLIST)], [AC_MSG_RESULT(no)])
130+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[extern char *sys_errlist[]; static char **x; x = sys_errlist;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYS_ERRLIST)],[AC_MSG_RESULT(no)])
131
132 AC_MSG_CHECKING(for sigset_t)
133-AC_TRY_LINK([
134+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
135 #include <signal.h>
136-], [sigset_t s; s = 0;],
137- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGSET_T)], [AC_MSG_RESULT(no)])
138+]], [[sigset_t s; s = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGSET_T)],[AC_MSG_RESULT(no)])
139
140 AC_MSG_CHECKING(for sigemptyset)
141-AC_TRY_LINK([
142+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
143 #include <signal.h>
144-], [sigset_t s; sigemptyset(&s);],
145- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGEMPTYSET)], [AC_MSG_RESULT(no)])
146+]], [[sigset_t s; sigemptyset(&s);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGEMPTYSET)],[AC_MSG_RESULT(no)])
147
148 have_errno=no
149 AC_MSG_CHECKING(for errno)
150-AC_TRY_LINK([
151+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
152 #if HAVE_ERRNO_H
153 #include <errno.h>
154-#endif], [static int x; x = errno;],
155- [AC_MSG_RESULT(yes - in errno.h); AC_DEFINE(HAVE_ERRNO) have_errno=yes])
156+#endif]], [[static int x; x = errno;]])],[AC_MSG_RESULT(yes - in errno.h); AC_DEFINE(HAVE_ERRNO) have_errno=yes],[])
157 if test $have_errno = no; then
158-AC_TRY_LINK([
159+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
160 #if HAVE_ERRNO_H
161 #include <errno.h>
162-#endif], [extern int errno; static int x; x = errno;],
163- [AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_ERRNO) AC_DEFINE(MUST_DEFINE_ERRNO)],
164- [AC_MSG_RESULT(no)])
165+#endif]], [[extern int errno; static int x; x = errno;]])],[AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_ERRNO) AC_DEFINE(MUST_DEFINE_ERRNO)],[AC_MSG_RESULT(no)])
166 fi
167
168 AC_MSG_CHECKING(for locale)
169-AC_TRY_LINK([#include <locale.h>
170-#include <ctype.h>], [setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);],
171- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LOCALE)], [AC_MSG_RESULT(no)])
172+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <locale.h>
173+#include <ctype.h>]], [[setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LOCALE)],[AC_MSG_RESULT(no)])
174 AC_MSG_CHECKING(for ctype functions)
175-AC_TRY_LINK([
176+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
177 #if HAVE_CTYPE_H
178 #include <ctype.h>
179-#endif], [static int x; x = isupper(x); x = tolower(x); x = toupper(x);],
180- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_UPPER_LOWER)], [AC_MSG_RESULT(no)])
181+#endif]], [[static int x; x = isupper(x); x = tolower(x); x = toupper(x);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_UPPER_LOWER)],[AC_MSG_RESULT(no)])
182
183 # Checks for external variable ospeed in the termcap library.
184 have_ospeed=no
185 AC_MSG_CHECKING(termcap for ospeed)
186-AC_TRY_LINK([
187+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
188 #include <sys/types.h>
189 #if HAVE_TERMIOS_H
190 #include <termios.h>
191 #endif
192 #if HAVE_TERMCAP_H
193 #include <termcap.h>
194-#endif], [ospeed = 0;],
195-[AC_MSG_RESULT(yes - in termcap.h); AC_DEFINE(HAVE_OSPEED) have_ospeed=yes])
196+#endif]], [[ospeed = 0;]])],[AC_MSG_RESULT(yes - in termcap.h); AC_DEFINE(HAVE_OSPEED) have_ospeed=yes],[])
197 if test $have_ospeed = no; then
198-AC_TRY_LINK(, [extern short ospeed; ospeed = 0;],
199- [AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_OSPEED) AC_DEFINE(MUST_DEFINE_OSPEED)],
200- [AC_MSG_RESULT(no)])
201+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[extern short ospeed; ospeed = 0;]])],[AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_OSPEED) AC_DEFINE(MUST_DEFINE_OSPEED)],[AC_MSG_RESULT(no)])
202 fi
203
204 # Checks for regular expression functions.
205@@ -311,7 +289,7 @@ if test $have_regex = no; then
206 if test $WANT_REGEX = auto -o $WANT_REGEX = posix; then
207 # Some versions of Solaris have a regcomp() function, but it doesn't work!
208 # So we run a test program. If we're cross-compiling, do it the old way.
209-AC_TRY_RUN([
210+AC_RUN_IFELSE([AC_LANG_SOURCE([[
211 #include <sys/types.h>
212 #include <regex.h>
213 main() { regex_t r; regmatch_t rm; char *text = "xabcy";
214@@ -322,19 +300,16 @@ if (rm.rm_so != 1) exit(1); /* check for
215 #else
216 if (rm.rm_sp != text + 1) exit(1); /* check for correct offset */
217 #endif
218-exit(0); }],
219- have_posix_regex=yes, have_posix_regex=no, have_posix_regex=unknown)
220+exit(0); }]])],[have_posix_regex=yes],[have_posix_regex=no],[have_posix_regex=unknown])
221 if test $have_posix_regex = yes; then
222 AC_MSG_RESULT(using POSIX regcomp)
223 AC_DEFINE(HAVE_POSIX_REGCOMP)
224 have_regex=yes
225 elif test $have_posix_regex = unknown; then
226- AC_TRY_LINK([
227+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
228 #include <sys/types.h>
229-#include <regex.h>],
230- [regex_t *r; regfree(r);],
231- AC_MSG_RESULT(using POSIX regcomp)
232- AC_DEFINE(HAVE_POSIX_REGCOMP) have_regex=yes)
233+#include <regex.h>]], [[regex_t *r; regfree(r);]])],[AC_MSG_RESULT(using POSIX regcomp)
234+ AC_DEFINE(HAVE_POSIX_REGCOMP) have_regex=yes],[])
235 else
236 AC_MSG_RESULT(no)
237 fi
238@@ -357,9 +332,8 @@ fi
239
240 if test $have_regex = no; then
241 if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp; then
242-AC_TRY_LINK([
243-#include "regexp.h"], [regcomp("");],
244-AC_MSG_RESULT(using V8 regcomp); AC_DEFINE(HAVE_V8_REGCOMP) have_regex=yes)
245+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
246+#include "regexp.h"]], [[regcomp("");]])],[AC_MSG_RESULT(using V8 regcomp); AC_DEFINE(HAVE_V8_REGCOMP) have_regex=yes],[])
247 fi
248 fi
249
diff --git a/meta/packages/less/less_382.bb b/meta/packages/less/less_406.bb
index f336a59ad6..c8ef2fc6e6 100644
--- a/meta/packages/less/less_382.bb
+++ b/meta/packages/less/less_406.bb
@@ -5,10 +5,8 @@ HOMEPAGE = "http://www.greenwoodsoftware.com/"
5SECTION = "console/utils" 5SECTION = "console/utils"
6LICENSE = "BSD" 6LICENSE = "BSD"
7DEPENDS = "ncurses" 7DEPENDS = "ncurses"
8PR = "r1"
9 8
10SRC_URI = "${GNU_MIRROR}/less/less-${PV}.tar.gz \ 9SRC_URI = "http://www.greenwoodsoftware.com/less/less-406.tar.gz "
11 file://configure.patch;patch=1"
12 10
13inherit autotools update-alternatives 11inherit autotools update-alternatives
14 12
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 21:26:06 +0000