Attachment 10334 Details for Bug 10862 – proposed patch for 4.2, cherry-picked from master

[patch] proposed patch for 4.2, cherry-picked from master

0001-build-do-not-install-texpect-binary-anymore.patch (text/plain), 1.37 KB, created by Björn Baumbach on 2014-10-09 15:19:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Baumbach

Created: 2014-10-09 15:19:56 UTC

Size: 1.37 KB

patch

obsolete

>From 52fdb8178327e684efe87d42ba6836645e271c63 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>Date: Thu, 9 Oct 2014 10:54:51 +0200
>Subject: [PATCH] build: do not install texpect binary anymore.
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10862
>
>Signed-off-by: Bjoern Baumbach <bb@sernet.de>
>Reviewed-by: Guenther Deschner <gd@samba.org>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>
>Autobuild-User(master): GÃ¼nther Deschner <gd@samba.org>
>Autobuild-Date(master): Thu Oct  9 17:10:12 CEST 2014 on sn-devel-104
>
>(cherry picked from commit c1f4b6c39beff7008a2746e65a9d8703b399f6a7)
>---
> lib/texpect/wscript | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
>diff --git a/lib/texpect/wscript b/lib/texpect/wscript
>index 51602f1..4163ca1 100644
>--- a/lib/texpect/wscript
>+++ b/lib/texpect/wscript
>@@ -1,9 +1,7 @@
> #!/usr/bin/env python
> 
> def configure(conf):
>-	conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True, headers='pty.h util.h libutil.h')
>+    conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True, headers='pty.h util.h libutil.h')
> 
> def build(bld):
>-	bld.SAMBA_BINARY('texpect',
>-                         'texpect.c',
>-                          deps='popt util')
>+    bld.SAMBA_BINARY('texpect', 'texpect.c', deps='popt util', install=False)
>-- 
>2.0.4
>

Flags:

metze: review+
gd: review+

Actions: View

Attachments on bug 10862: 10334