From 3048bd79b306f7af4b202bf6332e6e53b49b1694 Mon Sep 17 00:00:00 2001 From: Matthew McClintock Date: Wed, 23 Nov 2011 01:19:17 -0700 Subject: [PATCH] sudo_1.8.1p2.bb: Pull patch from upstream to fix parallel build issue (From OE-Core rev: 255588da1834b45325cf6677906aef2687a3b5f6) Signed-off-by: Matthew McClintock Signed-off-by: Richard Purdie --- .../sudo/files/sudo-parallel-build.patch | 15 +++++++++++++++ meta/recipes-extended/sudo/sudo_1.8.1p2.bb | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100755 meta/recipes-extended/sudo/files/sudo-parallel-build.patch 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 @@ +Upstream-Status: Accepted + +Index: sudo-1.8.1p2/plugins/sudoers/Makefile.in +=================================================================== +--- sudo-1.8.1p2.orig/plugins/sudoers/Makefile.in ++++ sudo-1.8.1p2/plugins/sudoers/Makefile.in +@@ -164,7 +164,7 @@ sudoers.la: $(SUDOERS_OBJS) libsudoers.l + visudo: libsudoers.la $(VISUDO_OBJS) $(LIBS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(VISUDO_OBJS) $(LDFLAGS) libsudoers.la $(LIBS) $(NET_LIBS) + +-sudoreplay: $(REPLAY_OBJS) $(LIBS) ++sudoreplay: timestr.lo $(REPLAY_OBJS) $(LIBS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(REPLAY_OBJS) $(LDFLAGS) timestr.lo $(REPLAY_LIBS) $(LIBS) + + 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 @@ require sudo.inc -PR = "r2" +PR = "r3" SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ file://libtool.patch \ + file://sudo-parallel-build.patch \ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" PAM_SRC_URI = "file://sudo.pam"