diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-08-13 16:26:43 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-16 22:40:54 +0100 |
commit | e623c1098708ae1bffbc581bc7cda400b925337c (patch) | |
tree | ee6a1bca0df0795fb36236d3b6b75be7ad8b4619 /meta/recipes-extended/screen/screen | |
parent | b3ec91dd4c0793e6b01b7eaec050d13cac1c8960 (diff) | |
download | poky-e623c1098708ae1bffbc581bc7cda400b925337c.tar.gz |
screen: Upgrade 4.0.3 -> 4.3.1
* License is now GPLv3+
* Remove patches that are already in upstream or not applicable
anymore
* Add a patchset to enable cross-compiling 4.3.1 (modified from
http://savannah.gnu.org/bugs/?43223)
(From OE-Core rev: c356d1ab0a807d9c2988b93d706a593fa3bc0fa5)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/screen/screen')
6 files changed, 415 insertions, 0 deletions
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 new file mode 100644 index 0000000000..e184aa1f31 --- /dev/null +++ b/meta/recipes-extended/screen/screen/Avoid-mis-identifying-systems-as-SVR4.patch | |||
@@ -0,0 +1,57 @@ | |||
1 | From 79afb676904653403145fda9e1a6a9d3ea1cb22a Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Fri, 7 Aug 2015 11:10:32 +0300 | ||
4 | Subject: [PATCH 4/4] Avoid mis-identifying systems as SVR4 | ||
5 | |||
6 | Linux can be misdetected as SVR4 because it has | ||
7 | libelf installed. This leads to linking with libelf, even though no | ||
8 | symbols from that library were actually used, and to a workaround for | ||
9 | a buggy getlogin() being enabled. | ||
10 | |||
11 | It is not documented which exact SVR4 system had the bug that the | ||
12 | workaround was added for, so all I could do is make an educated guess | ||
13 | at the #defines its compiler would be likely to set. | ||
14 | |||
15 | Modified from patch by Maarten ter Huurne. | ||
16 | |||
17 | Upstream-Status: Submitted [http://savannah.gnu.org/bugs/?43223] | ||
18 | |||
19 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
20 | --- | ||
21 | configure.ac | 14 ++++++++++++-- | ||
22 | 1 file changed, 12 insertions(+), 2 deletions(-) | ||
23 | |||
24 | diff --git a/configure.ac b/configure.ac | ||
25 | index 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 | -- | ||
56 | 2.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 new file mode 100644 index 0000000000..248bf087e2 --- /dev/null +++ b/meta/recipes-extended/screen/screen/Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch | |||
@@ -0,0 +1,137 @@ | |||
1 | From cd0f7f10a3fffbc60fe55eb200474d13fe1da65b Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Fri, 7 Aug 2015 10:34:29 +0300 | ||
4 | Subject: [PATCH 2/4] Provide cross compile alternatives for AC_TRY_RUN | ||
5 | |||
6 | Modified from patch by Maarten ter Huurne. | ||
7 | |||
8 | Upstream-Status: Submitted [http://savannah.gnu.org/bugs/?43223] | ||
9 | |||
10 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
11 | --- | ||
12 | configure.ac | 32 ++++++++++++++++++++------------ | ||
13 | 1 file changed, 20 insertions(+), 12 deletions(-) | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index 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 | -- | ||
136 | 2.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 new file mode 100644 index 0000000000..cc62c12e05 --- /dev/null +++ b/meta/recipes-extended/screen/screen/Remove-redundant-compiler-sanity-checks.patch | |||
@@ -0,0 +1,65 @@ | |||
1 | From 73b726c25f94c1b15514ed9249b927afdfbbfb94 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Fri, 7 Aug 2015 10:30:40 +0300 | ||
4 | Subject: [PATCH 1/4] Remove redundant compiler sanity checks | ||
5 | |||
6 | AC_PROG_CC already performs sanity checks. And unlike the removed | ||
7 | checks, it does so in a way that supports cross compilation. | ||
8 | |||
9 | Modified from patch by Maarten ter Huurne. | ||
10 | |||
11 | Upstream-Status: Submitted [http://savannah.gnu.org/bugs/?43223] | ||
12 | |||
13 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
14 | --- | ||
15 | configure.ac | 27 --------------------------- | ||
16 | 1 file changed, 27 deletions(-) | ||
17 | |||
18 | diff --git a/configure.ac b/configure.ac | ||
19 | index 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 | -- | ||
64 | 2.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 new file mode 100644 index 0000000000..d7e55a4451 --- /dev/null +++ b/meta/recipes-extended/screen/screen/Skip-host-file-system-checks-when-cross-compiling.patch | |||
@@ -0,0 +1,135 @@ | |||
1 | From d0b20e4cacc60ad62a2150ce07388cb5a25c2040 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Fri, 7 Aug 2015 11:09:01 +0300 | ||
4 | Subject: [PATCH 3/4] Skip host file system checks when cross-compiling | ||
5 | |||
6 | Modified from patch by Maarten ter Huurne. | ||
7 | |||
8 | Upstream-Status: Submitted [http://savannah.gnu.org/bugs/?43223] | ||
9 | |||
10 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
11 | --- | ||
12 | configure.ac | 23 +++++++++++++++++++---- | ||
13 | 1 file changed, 19 insertions(+), 4 deletions(-) | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index 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 | -- | ||
134 | 2.1.4 | ||
135 | |||
diff --git a/meta/recipes-extended/screen/screen/fix-parallel-make.patch b/meta/recipes-extended/screen/screen/fix-parallel-make.patch new file mode 100644 index 0000000000..e0caf5d83e --- /dev/null +++ b/meta/recipes-extended/screen/screen/fix-parallel-make.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | This fixes the parallel make install failure | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
6 | |||
7 | Index: screen-4.0.3/Makefile.in | ||
8 | =================================================================== | ||
9 | --- screen-4.0.3.orig/Makefile.in | ||
10 | +++ screen-4.0.3/Makefile.in | ||
11 | @@ -70,7 +70,7 @@ screen: $(OFILES) | ||
12 | .c.o: | ||
13 | $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $< | ||
14 | |||
15 | -install_bin: .version screen | ||
16 | +install_bin: .version screen installdirs | ||
17 | -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \ | ||
18 | then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi | ||
19 | $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) | ||
diff --git a/meta/recipes-extended/screen/screen/screen.pam b/meta/recipes-extended/screen/screen/screen.pam new file mode 100644 index 0000000000..ff657fa07c --- /dev/null +++ b/meta/recipes-extended/screen/screen/screen.pam | |||
@@ -0,0 +1,2 @@ | |||
1 | #%PAM-1.0 | ||
2 | auth include common-auth | ||