summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2011-11-23 01:19:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-30 16:43:42 +0000
commit3048bd79b306f7af4b202bf6332e6e53b49b1694 (patch)
tree01d8b54236bb81004d26fb7e4fe000a231d40060 /meta
parentef37926f314da1aeb57fd2f4ad60a08607982365 (diff)
downloadpoky-3048bd79b306f7af4b202bf6332e6e53b49b1694.tar.gz
sudo_1.8.1p2.bb: Pull patch from upstream to fix parallel build issue
(From OE-Core rev: 255588da1834b45325cf6677906aef2687a3b5f6) Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rwxr-xr-xmeta/recipes-extended/sudo/files/sudo-parallel-build.patch15
-rw-r--r--meta/recipes-extended/sudo/sudo_1.8.1p2.bb3
2 files changed, 17 insertions, 1 deletions
diff --git a/meta/recipes-extended/sudo/files/sudo-parallel-build.patch b/meta/recipes-extended/sudo/files/sudo-parallel-build.patch
new file mode 100755
index 0000000000..6cfe56dddd
--- /dev/null
+++ b/meta/recipes-extended/sudo/files/sudo-parallel-build.patch
@@ -0,0 +1,15 @@
1Upstream-Status: Accepted
2
3Index: sudo-1.8.1p2/plugins/sudoers/Makefile.in
4===================================================================
5--- sudo-1.8.1p2.orig/plugins/sudoers/Makefile.in
6+++ sudo-1.8.1p2/plugins/sudoers/Makefile.in
7@@ -164,7 +164,7 @@ sudoers.la: $(SUDOERS_OBJS) libsudoers.l
8 visudo: libsudoers.la $(VISUDO_OBJS) $(LIBS)
9 $(LIBTOOL) --mode=link $(CC) -o $@ $(VISUDO_OBJS) $(LDFLAGS) libsudoers.la $(LIBS) $(NET_LIBS)
10
11-sudoreplay: $(REPLAY_OBJS) $(LIBS)
12+sudoreplay: timestr.lo $(REPLAY_OBJS) $(LIBS)
13 $(LIBTOOL) --mode=link $(CC) -o $@ $(REPLAY_OBJS) $(LDFLAGS) timestr.lo $(REPLAY_LIBS) $(LIBS)
14
15 testsudoers: libsudoers.la $(TEST_OBJS) $(LIBS)
diff --git a/meta/recipes-extended/sudo/sudo_1.8.1p2.bb b/meta/recipes-extended/sudo/sudo_1.8.1p2.bb
index 6629d1ef74..b065447ed4 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.1p2.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.1p2.bb
@@ -1,9 +1,10 @@
1require sudo.inc 1require sudo.inc
2 2
3PR = "r2" 3PR = "r3"
4 4
5SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ 5SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
6 file://libtool.patch \ 6 file://libtool.patch \
7 file://sudo-parallel-build.patch \
7 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" 8 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
8 9
9PAM_SRC_URI = "file://sudo.pam" 10PAM_SRC_URI = "file://sudo.pam"