Attachment 8620 Details for Bug 9703 – patches cherry-picked from master

[patch] patches cherry-picked from master

0001-build-Do-not-force-a-specific-perl-from-PERL-when-ru.patch (text/plain), 1.51 KB, created by Andrew Bartlett on 2013-03-08 01:33:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2013-03-08 01:33:13 UTC

Size: 1.51 KB

patch

obsolete

>From a35a5b081439d1ab5c12e2d04657c2f2344146d6 Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Fri, 8 Feb 2013 09:12:20 +1100
>Subject: [PATCH] build: Do not force a specific perl from ${PERL} when
> running pod2man
>
>pod2man should have the right #!/usr/bin/perl line already, and forcing it may
>cause us to use the wrong perl.
>
>Essentially treat this like any other system binary, rather than forcing
>it to use the first perl we found.
>
>This essentially reverts e80f576db66ad04592ac436ed74ceb9b96452060.
>Current SLES11 does not seem to have the issue this was added to
>address.
>
>Andrew Bartlett
>
>Reviewed-by: Michael Adam <obnox@samba.org>
>
>Autobuild-User(master): Michael Adam <obnox@samba.org>
>Autobuild-Date(master): Thu Feb 28 02:14:25 CET 2013 on sn-devel-104
>(cherry picked from commit 1da22ab994822acacf9a0378c68b15cd32535390)
>---
> pidl/wscript | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/pidl/wscript b/pidl/wscript
>index e60ca20..7a25734 100644
>--- a/pidl/wscript
>+++ b/pidl/wscript
>@@ -49,7 +49,7 @@ def build(bld):
>     bld.SET_BUILD_GROUP('final')
>     if 'POD2MAN' in bld.env and bld.env['POD2MAN'] != '':
>         for src, manpage in pidl_manpages.iteritems():
>-            bld(rule='${PERL} ${POD2MAN} -c "Samba Documentation" ${SRC} ${TGT}',
>+            bld(rule='${POD2MAN} -c "Samba Documentation" ${SRC} ${TGT}',
>                 shell=True,
>                 source=src,
>                 install_path=os.path.dirname(bld.EXPAND_VARIABLES('${MANDIR}/'+manpage)),
>-- 
>1.7.11.7
>

Flags:

obnox: review+

Actions: View

Attachments on bug 9703: 8620