diff options
| author |   Armin Kuster <akuster808@gmail.com> | 2016-05-23 21:30:34 -0700 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2016-08-16 10:29:39 -0700 |
| commit | 4ee1c29420952a7c9fed847946b923eba35880b2 (patch) | |
| tree | b8b77d3106e18eed3ac3034eec6137c053015e0c | |
| parent | 7166a2daecfbb4528fa410670adcc7f241715bd5 (diff) | |
| download | meta-openembedded-contrib-4ee1c29420952a7c9fed847946b923eba35880b2.tar.gz | |
netkit-rsh: fix build issue.
glibc deprecate union wait and remove support from wait functions
https://sourceware.org/ml/libc-alpha/2016-02/msg00342.html
change rlogin.c accordingly
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
(cherry picked from commit 62e3df2ddbeff9f2293027af6f159260cd2ab134)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fixup_wait3_api_change.patch | 34 | ||||
| -rw-r--r-- | meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fixup_wait3_api_change.patch b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fixup_wait3_api_change.patch new file mode 100644 index 0000000000..cd6df62fb3 --- /dev/null +++ b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fixup_wait3_api_change.patch @@ -0,0 +1,34 @@ +Fix build issue do to Deprecate union wait and remove support from wait functions [BZ #19613] + +| rlogin.c: In function 'catch_child': +| rlogin.c:463:13: error: storage size of 'status' isn't known +| union wait status; + +https://sourceware.org/ml/libc-alpha/2016-02/msg00342.html + +Upstream-Status: Inappropriate [ no upstream maintaner ] + +Signed-off-by Armin Kuster <akuster@mvista.com> + +Index: netkit-rsh-0.17/rlogin/rlogin.c +=================================================================== +--- netkit-rsh-0.17.orig/rlogin/rlogin.c ++++ netkit-rsh-0.17/rlogin/rlogin.c +@@ -460,7 +460,7 @@ writeroob(int ignore) + void + catch_child(int ignore) + { +- union wait status; ++ int status; + int pid; + + (void)ignore; +@@ -471,7 +471,7 @@ catch_child(int ignore) + return; + /* if the child (reader) dies, just quit */ + if (pid < 0 || (pid == childpid && !WIFSTOPPED(status))) +- done((int)(status.w_termsig | status.w_retcode)); ++ done((int)(WTERMSIG(status) | WEXITSTATUS(status))); + } + /* NOTREACHED */ + } diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb index e29369c495..44a8e0ab33 100644 --- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb +++ b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb @@ -15,6 +15,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-rsh/netkit-rsh_${PV}.orig.tar.gz;name= file://rsh.xinetd.netkit \ file://netkit-rsh-0.17-rexec-ipv6.patch \ file://fix-host-variable.patch \ + file://fixup_wait3_api_change.patch \ " SRC_URI[archive.md5sum] = "65f5f28e2fe22d9ad8b17bb9a10df096" |