summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/screen
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-10-26 23:42:14 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-28 05:31:42 +0000
commitdbf5285f868c6b7231bfac5e15bb16fd75fa3c04 (patch)
tree89097f371522d0e696212ab399ee1f2e36fd7303 /meta/recipes-extended/screen
parentcedd55fc3e6e64c9b8b9ed76325721a6256727ba (diff)
downloadpoky-dbf5285f868c6b7231bfac5e15bb16fd75fa3c04.tar.gz
screen: Upgrade 4.6.2 -> 4.7.0
Patches applied upstream removed. (From OE-Core rev: 16425fbd8e2565b1a40462840e3f0931ae1a7b6c) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/screen')
-rw-r--r--meta/recipes-extended/screen/screen/0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch109
-rw-r--r--meta/recipes-extended/screen/screen/Avoid-mis-identifying-systems-as-SVR4.patch57
-rw-r--r--meta/recipes-extended/screen/screen/Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch137
-rw-r--r--meta/recipes-extended/screen/screen/Remove-redundant-compiler-sanity-checks.patch65
-rw-r--r--meta/recipes-extended/screen/screen/Skip-host-file-system-checks-when-cross-compiling.patch135
-rw-r--r--meta/recipes-extended/screen/screen_4.7.0.bb (renamed from meta/recipes-extended/screen/screen_4.6.2.bb)9
6 files changed, 2 insertions, 510 deletions
diff --git a/meta/recipes-extended/screen/screen/0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch b/meta/recipes-extended/screen/screen/0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch
deleted file mode 100644
index 1274b27940..0000000000
--- a/meta/recipes-extended/screen/screen/0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch
+++ /dev/null
@@ -1,109 +0,0 @@
1From 4b258c5a9078f8df60684ab7536ce3a8ff207e08 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 12 Oct 2017 10:03:57 +0000
4Subject: [PATCH] configure.ac: fix configure failed while build dir contains "yes"
5
6While the name of build dir contains "yes", the AC_EGREP_CPP
7test always return true.
8
9We rarely use "yes;" to name build dir, so s/yes/yes;/g
10could fix the issue
11
12Upstream-Status: Accepted
13https://git.savannah.gnu.org/cgit/screen.git/commit/?h=screen-v4&id=8c2b4061d16756ee2ed37f08db063b8215656943
14
15Signed-off-by: Jian Kang <jian.kang@windriver.com>
16---
17 configure.ac | 20 ++++++++++----------
18 1 file changed, 10 insertions(+), 10 deletions(-)
19
20diff --git a/configure.ac b/configure.ac
21index 12996cd..4765af6 100644
22--- a/configure.ac
23+++ b/configure.ac
24@@ -128,7 +128,7 @@ fi
25
26
27 AC_CHECKING(for Ultrix)
28-AC_EGREP_CPP(yes,
29+AC_EGREP_CPP(yes;,
30 [#if defined(ultrix) || defined(__ultrix)
31 yes;
32 #endif
33@@ -145,7 +145,7 @@ dnl ghazi@caip.rutgers.edu (Kaveh R. Ghazi):
34 dnl BBN butterfly is not POSIX, but a MACH BSD system.
35 dnl Do not define POSIX and TERMIO.
36 AC_CHECKING(for butterfly)
37-AC_EGREP_CPP(yes,
38+AC_EGREP_CPP(yes;,
39 [#if defined(butterfly)
40 yes;
41 #endif
42@@ -156,7 +156,7 @@ if test -n "$ULTRIX"; then
43 test -z "$GCC" && CC="$CC -YBSD"
44 fi
45 AC_CHECKING(for POSIX.1)
46-AC_EGREP_CPP(yes,
47+AC_EGREP_CPP(yes;,
48 [#include <sys/types.h>
49 #include <unistd.h>
50 main () {
51@@ -173,14 +173,14 @@ AC_TRY_COMPILE(
52 #include <fcntl.h>], [int x = SIGCHLD | FNDELAY;], , AC_DEFINE(SYSV))
53
54 AC_CHECKING(for sequent/ptx)
55-AC_EGREP_CPP(yes,
56+AC_EGREP_CPP(yes;,
57 [#ifdef _SEQUENT_
58 yes;
59 #endif
60 ], LIBS="$LIBS -lsocket -linet";seqptx=1)
61
62 AC_CHECKING(SVR4)
63-AC_EGREP_CPP(yes,
64+AC_EGREP_CPP(yes;,
65 [main () {
66 #if defined(SVR4) || defined(__SVR4)
67 yes;
68@@ -200,9 +200,9 @@ fi
69 AC_CHECK_HEADERS([stropts.h string.h strings.h])
70
71 AC_CHECKING(for Solaris 2.x)
72-AC_EGREP_CPP(yes,
73+AC_EGREP_CPP(yes;,
74 [#if defined(SVR4) && defined(sun)
75- yes
76+ yes;
77 #endif
78 ], LIBS="$LIBS -lsocket -lnsl -lkstat")
79
80@@ -697,7 +697,7 @@ else
81 pdir='/dev'
82 fi
83 dnl SCO uses ptyp%d
84-AC_EGREP_CPP(yes,
85+AC_EGREP_CPP(yes;,
86 [#ifdef M_UNIX
87 yes;
88 #endif
89@@ -880,7 +880,7 @@ fi
90 )
91
92 if test -z "$load" ; then
93-AC_EGREP_CPP(yes,
94+AC_EGREP_CPP(yes;,
95 [#if defined(NeXT) || defined(apollo) || defined(linux)
96 yes;
97 #endif
98@@ -1112,7 +1112,7 @@ AC_CHECKING(syslog in libbsd.a)
99 AC_TRY_LINK(, [closelog();], AC_NOTE(- found.), [LIBS="$oldlibs"
100 AC_NOTE(- bad news: syslog missing.) AC_DEFINE(NOSYSLOG)])])
101
102-AC_EGREP_CPP(yes,
103+AC_EGREP_CPP(yes;,
104 [#ifdef M_UNIX
105 yes;
106 #endif
107--
1082.13.3
109
diff --git a/meta/recipes-extended/screen/screen/Avoid-mis-identifying-systems-as-SVR4.patch b/meta/recipes-extended/screen/screen/Avoid-mis-identifying-systems-as-SVR4.patch
deleted file mode 100644
index e184aa1f31..0000000000
--- a/meta/recipes-extended/screen/screen/Avoid-mis-identifying-systems-as-SVR4.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1From 79afb676904653403145fda9e1a6a9d3ea1cb22a Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Fri, 7 Aug 2015 11:10:32 +0300
4Subject: [PATCH 4/4] Avoid mis-identifying systems as SVR4
5
6Linux can be misdetected as SVR4 because it has
7libelf installed. This leads to linking with libelf, even though no
8symbols from that library were actually used, and to a workaround for
9a buggy getlogin() being enabled.
10
11It is not documented which exact SVR4 system had the bug that the
12workaround was added for, so all I could do is make an educated guess
13at the #defines its compiler would be likely to set.
14
15Modified from patch by Maarten ter Huurne.
16
17Upstream-Status: Submitted [http://savannah.gnu.org/bugs/?43223]
18
19Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
20---
21 configure.ac | 14 ++++++++++++--
22 1 file changed, 12 insertions(+), 2 deletions(-)
23
24diff --git a/configure.ac b/configure.ac
25index dc928ae..65439ce 100644
26--- a/configure.ac
27+++ b/configure.ac
28@@ -179,14 +179,24 @@ AC_EGREP_CPP(yes,
29 #endif
30 ], LIBS="$LIBS -lsocket -linet";seqptx=1)
31
32+AC_CHECKING(SVR4)
33+AC_EGREP_CPP(yes,
34+[main () {
35+#if defined(SVR4) || defined(__SVR4)
36+ yes;
37+#endif
38+], AC_NOTE(- you have a SVR4 system) AC_DEFINE(SVR4) svr4=1)
39+if test -n "$svr4" ; then
40 oldlibs="$LIBS"
41 LIBS="$LIBS -lelf"
42 AC_CHECKING(SVR4)
43 AC_TRY_LINK([#include <utmpx.h>
44 ],,
45-[AC_CHECK_HEADER(dwarf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN),
46-[AC_CHECK_HEADER(elf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN))])]
47+[AC_CHECK_HEADER(dwarf.h, AC_DEFINE(BUGGYGETLOGIN),
48+[AC_CHECK_HEADER(elf.h, AC_DEFINE(BUGGYGETLOGIN))])]
49 ,LIBS="$oldlibs")
50+fi
51+
52 AC_CHECK_HEADERS([stropts.h string.h strings.h])
53
54 AC_CHECKING(for Solaris 2.x)
55--
562.1.4
57
diff --git a/meta/recipes-extended/screen/screen/Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch b/meta/recipes-extended/screen/screen/Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch
deleted file mode 100644
index 248bf087e2..0000000000
--- a/meta/recipes-extended/screen/screen/Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch
+++ /dev/null
@@ -1,137 +0,0 @@
1From cd0f7f10a3fffbc60fe55eb200474d13fe1da65b Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Fri, 7 Aug 2015 10:34:29 +0300
4Subject: [PATCH 2/4] Provide cross compile alternatives for AC_TRY_RUN
5
6Modified from patch by Maarten ter Huurne.
7
8Upstream-Status: Submitted [http://savannah.gnu.org/bugs/?43223]
9
10Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
11---
12 configure.ac | 32 ++++++++++++++++++++------------
13 1 file changed, 20 insertions(+), 12 deletions(-)
14
15diff --git a/configure.ac b/configure.ac
16index 27690a6..ce89f56 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -348,7 +348,8 @@ main()
20 exit(0);
21 }
22 ], AC_NOTE(- your fifos are usable) fifo=1,
23-AC_NOTE(- your fifos are not usable))
24+AC_NOTE(- your fifos are not usable),
25+AC_NOTE(- skipping check because we are cross compiling; assuming fifos are usable) fifo=1)
26 rm -f /tmp/conftest*
27
28 if test -n "$fifo"; then
29@@ -396,7 +397,8 @@ main()
30 exit(0);
31 }
32 ], AC_NOTE(- your implementation is ok),
33-AC_NOTE(- you have a broken implementation) AC_DEFINE(BROKEN_PIPE) fifobr=1)
34+AC_NOTE(- you have a broken implementation) AC_DEFINE(BROKEN_PIPE) fifobr=1,
35+AC_NOTE(- skipping check because we are cross compiling; assuming fifo implementation is ok))
36 rm -f /tmp/conftest*
37 fi
38
39@@ -458,7 +460,8 @@ main()
40 exit(0);
41 }
42 ], AC_NOTE(- your sockets are usable) sock=1,
43-AC_NOTE(- your sockets are not usable))
44+AC_NOTE(- your sockets are not usable),
45+AC_NOTE(- skipping check because we are cross compiling; assuming sockets are usable) sock=1)
46 rm -f /tmp/conftest*
47
48 if test -n "$sock"; then
49@@ -497,7 +500,8 @@ main()
50 }
51 ],AC_NOTE(- you are normal),
52 AC_NOTE(- unix domain sockets are not kept in the filesystem)
53-AC_DEFINE(SOCK_NOT_IN_FS) socknofs=1)
54+AC_DEFINE(SOCK_NOT_IN_FS) socknofs=1,
55+AC_NOTE(- skipping check because we are cross compiling; assuming sockets are normal))
56 rm -f /tmp/conftest*
57 fi
58
59@@ -624,7 +628,8 @@ main()
60 exit(0);
61 }
62 ],AC_NOTE(- select is ok),
63-AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN))
64+AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN),
65+AC_NOTE(- skipping check because we are cross compiling; assuming select is ok))
66
67 dnl
68 dnl **** termcap or terminfo ****
69@@ -666,7 +671,8 @@ main()
70 {
71 exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
72 }], AC_NOTE(- you use the termcap database),
73-AC_NOTE(- you use the terminfo database) AC_DEFINE(TERMINFO))
74+AC_NOTE(- you use the terminfo database) AC_DEFINE(TERMINFO),
75+AC_NOTE(- skipping check because we are cross compiling; assuming terminfo database is used) AC_DEFINE(TERMINFO))
76 AC_CHECKING(ospeed)
77 AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED))
78
79@@ -801,7 +807,8 @@ main()
80 else
81 AC_NOTE(- can't determine - assume ptys are world accessable)
82 fi
83- ]
84+ ],
85+ AC_NOTE(- skipping check because we are cross compiling; assuming ptys are world accessable)
86 )
87 rm -f conftest_grp
88 fi
89@@ -885,7 +892,7 @@ AC_EGREP_CPP(yes,
90 #endif
91 ], load=1)
92 fi
93-if test -z "$load" ; then
94+if test -z "$load" && test "$cross_compiling" = no ; then
95 AC_CHECKING(for kernelfile)
96 for core in /unix /vmunix /dynix /hp-ux /xelos /dev/ksyms /kernel/unix /kernel/genunix /unicos /mach /netbsd /386bsd /dgux /bsd /stand/vmunix; do
97 if test -f $core || test -c $core; then
98@@ -1078,7 +1085,7 @@ main()
99 #endif
100 exit(0);
101 }
102-],,AC_DEFINE(SYSVSIGS))
103+],,AC_DEFINE(SYSVSIGS),:)
104
105 fi
106
107@@ -1158,7 +1165,7 @@ main() {
108 if (strncmp(buf, "cdedef", 6))
109 exit(1);
110 exit(0); /* libc version works properly. */
111-}], AC_DEFINE(USEBCOPY))
112+}], AC_DEFINE(USEBCOPY),,:)
113
114 AC_TRY_RUN([
115 #define bcopy(s,d,l) memmove(d,s,l)
116@@ -1173,7 +1180,8 @@ main() {
117 if (strncmp(buf, "cdedef", 6))
118 exit(1);
119 exit(0); /* libc version works properly. */
120-}], AC_DEFINE(USEMEMMOVE))
121+}], AC_DEFINE(USEMEMMOVE),,
122+ AC_NOTE(- skipping check because we are cross compiling; use memmove) AC_DEFINE(USEMEMMOVE))
123
124
125 AC_TRY_RUN([
126@@ -1189,7 +1197,7 @@ main() {
127 if (strncmp(buf, "cdedef", 6))
128 exit(1);
129 exit(0); /* libc version works properly. */
130-}], AC_DEFINE(USEMEMCPY))
131+}], AC_DEFINE(USEMEMCPY),,:)
132
133 AC_SYS_LONG_FILE_NAMES
134
135--
1362.1.4
137
diff --git a/meta/recipes-extended/screen/screen/Remove-redundant-compiler-sanity-checks.patch b/meta/recipes-extended/screen/screen/Remove-redundant-compiler-sanity-checks.patch
deleted file mode 100644
index cc62c12e05..0000000000
--- a/meta/recipes-extended/screen/screen/Remove-redundant-compiler-sanity-checks.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1From 73b726c25f94c1b15514ed9249b927afdfbbfb94 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Fri, 7 Aug 2015 10:30:40 +0300
4Subject: [PATCH 1/4] Remove redundant compiler sanity checks
5
6AC_PROG_CC already performs sanity checks. And unlike the removed
7checks, it does so in a way that supports cross compilation.
8
9Modified from patch by Maarten ter Huurne.
10
11Upstream-Status: Submitted [http://savannah.gnu.org/bugs/?43223]
12
13Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
14---
15 configure.ac | 27 ---------------------------
16 1 file changed, 27 deletions(-)
17
18diff --git a/configure.ac b/configure.ac
19index ffe2e37..27690a6 100644
20--- a/configure.ac
21+++ b/configure.ac
22@@ -48,31 +48,6 @@ AC_PROG_GCC_TRADITIONAL
23 AC_ISC_POSIX
24 AC_USE_SYSTEM_EXTENSIONS
25
26-AC_TRY_RUN(main(){exit(0);},,[
27-if test $CC != cc ; then
28-AC_NOTE(Your $CC failed - restarting with CC=cc)
29-AC_NOTE()
30-CC=cc
31-export CC
32-exec $0 $configure_args
33-fi
34-])
35-
36-AC_TRY_RUN(main(){exit(0);},,
37-exec 5>&2
38-eval $ac_link
39-AC_NOTE(CC=$CC; CFLAGS=$CFLAGS; LIBS=$LIBS;)
40-AC_NOTE($ac_compile)
41-AC_MSG_ERROR(Can't run the compiler - sorry))
42-
43-AC_TRY_RUN([
44-main()
45-{
46- int __something_strange_();
47- __something_strange_(0);
48-}
49-],AC_MSG_ERROR(Your compiler does not set the exit status - sorry))
50-
51 AC_PROG_AWK
52
53 AC_PROG_INSTALL
54@@ -1300,8 +1275,6 @@ fi
55 dnl Ptx bug workaround -- insert -lc after -ltermcap
56 test -n "$seqptx" && LIBS="-ltermcap -lc -lsocket -linet -lnsl -lsec -lseq"
57
58-AC_TRY_RUN(main(){exit(0);},,AC_MSG_ERROR(Can't run the compiler - internal error. Sorry.))
59-
60 ETCSCREENRC=
61 AC_MSG_CHECKING(for the global screenrc file)
62 AC_ARG_WITH(sys-screenrc, [ --with-sys-screenrc=path to the global screenrc file], [ ETCSCREENRC="${withval}" ])
63--
642.1.4
65
diff --git a/meta/recipes-extended/screen/screen/Skip-host-file-system-checks-when-cross-compiling.patch b/meta/recipes-extended/screen/screen/Skip-host-file-system-checks-when-cross-compiling.patch
deleted file mode 100644
index d7e55a4451..0000000000
--- a/meta/recipes-extended/screen/screen/Skip-host-file-system-checks-when-cross-compiling.patch
+++ /dev/null
@@ -1,135 +0,0 @@
1From d0b20e4cacc60ad62a2150ce07388cb5a25c2040 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Fri, 7 Aug 2015 11:09:01 +0300
4Subject: [PATCH 3/4] Skip host file system checks when cross-compiling
5
6Modified from patch by Maarten ter Huurne.
7
8Upstream-Status: Submitted [http://savannah.gnu.org/bugs/?43223]
9
10Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
11---
12 configure.ac | 23 +++++++++++++++++++----
13 1 file changed, 19 insertions(+), 4 deletions(-)
14
15diff --git a/configure.ac b/configure.ac
16index ce89f56..dc928ae 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -85,7 +85,7 @@ AC_ARG_ENABLE(socket-dir,
20 dnl
21 dnl **** special unix variants ****
22 dnl
23-if test -n "$ISC"; then
24+if test "$cross_compiling" = no && test -n "$ISC" ; then
25 AC_DEFINE(ISC) LIBS="$LIBS -linet"
26 fi
27
28@@ -96,10 +96,11 @@ dnl AC_DEFINE(OSF1) # this disables MIPS again....
29 dnl fi
30 dnl fi
31
32-if test -f /sysV68 ; then
33+if test "$cross_compiling" = no && test -f /sysV68 ; then
34 AC_DEFINE(sysV68)
35 fi
36
37+if test "$cross_compiling" = no ; then
38 AC_CHECKING(for MIPS)
39 if test -f /lib/libmld.a || test -f /usr/lib/libmld.a || test -f /usr/lib/cmplrs/cc/libmld.a; then
40 oldlibs="$LIBS"
41@@ -123,6 +124,7 @@ AC_DEFINE(USE_WAIT2) LIBS="$LIBS -lbsd" ; CC="$CC -I/usr/include/bsd"
42 ))
43 fi
44 fi
45+fi
46
47
48 AC_CHECKING(for Ultrix)
49@@ -132,7 +134,7 @@ AC_EGREP_CPP(yes,
50 #endif
51 ], ULTRIX=1)
52
53-if test -f /usr/lib/libpyr.a ; then
54+if test "$cross_compiling" = no && test -f /usr/lib/libpyr.a ; then
55 oldlibs="$LIBS"
56 LIBS="$LIBS -lpyr"
57 AC_CHECKING(Pyramid OSX)
58@@ -679,17 +681,21 @@ AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED))
59 dnl
60 dnl **** PTY specific things ****
61 dnl
62+if test "$cross_compiling" = no ; then
63 AC_CHECKING(for /dev/ptc)
64 if test -r /dev/ptc; then
65 AC_DEFINE(HAVE_DEV_PTC)
66 fi
67+fi
68
69+if test "$cross_compiling" = no ; then
70 AC_CHECKING(for SVR4 ptys)
71 sysvr4ptys=
72 if test -c /dev/ptmx ; then
73 AC_TRY_LINK([],[ptsname(0);grantpt(0);unlockpt(0);],[AC_DEFINE(HAVE_SVR4_PTYS)
74 sysvr4ptys=1])
75 fi
76+fi
77
78 AC_CHECK_FUNCS(getpt)
79
80@@ -699,6 +705,7 @@ AC_CHECK_FUNCS(openpty,,
81 [AC_CHECK_LIB(util,openpty, [AC_DEFINE(HAVE_OPENPTY)] [LIBS="$LIBS -lutil"])])
82 fi
83
84+if test "$cross_compiling" = no ; then
85 AC_CHECKING(for ptyranges)
86 if test -d /dev/ptym ; then
87 pdir='/dev/ptym'
88@@ -722,6 +729,7 @@ p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\
89 AC_DEFINE_UNQUOTED(PTYRANGE0,"$p0")
90 AC_DEFINE_UNQUOTED(PTYRANGE1,"$p1")
91 fi
92+fi
93
94 dnl **** pty mode/group handling ****
95 dnl
96@@ -869,14 +877,16 @@ fi
97 dnl
98 dnl **** loadav ****
99 dnl
100+if test "$cross_compiling" = no ; then
101 AC_CHECKING(for libutil(s))
102 test -f /usr/lib/libutils.a && LIBS="$LIBS -lutils"
103 test -f /usr/lib/libutil.a && LIBS="$LIBS -lutil"
104+fi
105
106 AC_CHECKING(getloadavg)
107 AC_TRY_LINK(,[getloadavg((double *)0, 0);],
108 AC_DEFINE(LOADAV_GETLOADAVG) load=1,
109-if test -f /usr/lib/libkvm.a ; then
110+if test "$cross_compiling" = no && test -f /usr/lib/libkvm.a ; then
111 olibs="$LIBS"
112 LIBS="$LIBS -lkvm"
113 AC_CHECKING(getloadavg with -lkvm)
114@@ -1094,13 +1104,18 @@ dnl **** libraries ****
115 dnl
116
117 AC_CHECKING(for crypt and sec libraries)
118+if test "$cross_compiling" = no ; then
119 test -f /lib/libcrypt_d.a || test -f /usr/lib/libcrypt_d.a && LIBS="$LIBS -lcrypt_d"
120+fi
121 oldlibs="$LIBS"
122 LIBS="$LIBS -lcrypt"
123 AC_CHECKING(crypt)
124 AC_TRY_LINK(,,,LIBS="$oldlibs")
125+if test "$cross_compiling" = no ; then
126 test -f /lib/libsec.a || test -f /usr/lib/libsec.a && LIBS="$LIBS -lsec"
127 test -f /lib/libshadow.a || test -f /usr/lib/libshadow.a && LIBS="$LIBS -lshadow"
128+fi
129+
130 oldlibs="$LIBS"
131 LIBS="$LIBS -lsun"
132 AC_CHECKING(IRIX sun library)
133--
1342.1.4
135
diff --git a/meta/recipes-extended/screen/screen_4.6.2.bb b/meta/recipes-extended/screen/screen_4.7.0.bb
index 21b476ddb0..67aa5f1fc6 100644
--- a/meta/recipes-extended/screen/screen_4.6.2.bb
+++ b/meta/recipes-extended/screen/screen_4.7.0.bb
@@ -17,18 +17,13 @@ RDEPENDS_${PN} = "base-files"
17 17
18SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ 18SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
19 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://screen.pam', '', d)} \ 19 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://screen.pam', '', d)} \
20 file://Remove-redundant-compiler-sanity-checks.patch \
21 file://Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch \
22 file://Skip-host-file-system-checks-when-cross-compiling.patch \
23 file://Avoid-mis-identifying-systems-as-SVR4.patch \
24 file://0002-comm.h-now-depends-on-term.h.patch \ 20 file://0002-comm.h-now-depends-on-term.h.patch \
25 file://0001-fix-for-multijob-build.patch \ 21 file://0001-fix-for-multijob-build.patch \
26 file://0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch \
27 file://0001-Remove-more-compatibility-stuff.patch \ 22 file://0001-Remove-more-compatibility-stuff.patch \
28 " 23 "
29 24
30SRC_URI[md5sum] = "a0f529d3333b128dfaa324d978ba73a8" 25SRC_URI[md5sum] = "b8971ebd68d046f2814d1040cb8e6641"
31SRC_URI[sha256sum] = "1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a" 26SRC_URI[sha256sum] = "da775328fa783bd2a787d722014dbd99c6093effc11f337827604c2efc5d20c1"
32 27
33inherit autotools texinfo 28inherit autotools texinfo
34 29
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-07 10:50:36 +0000