1
0
forked from brl/citadel
citadel/poky/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch

140 lines
3.6 KiB
Diff
Raw Normal View History

From 6fab82b93c7bd301eb42448515b02f7cb3306897 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 31 Aug 2016 16:44:46 +0300
Subject: [PATCH] Do not hardocode paths to perl/python in scripts.
Doing so when the interpreters are somewhere deep in a sysroot directory
can reach the shebang line limit, and resulting scripts wouldn't work
on targets either.
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
gtkdoc-check.in | 2 +-
gtkdoc-common.pl.in | 2 +-
gtkdoc-depscan.in | 2 +-
gtkdoc-fixxref.in | 2 +-
gtkdoc-mkdb.in | 2 +-
gtkdoc-mktmpl.in | 2 +-
gtkdoc-rebase.in | 2 +-
gtkdoc-scan.in | 2 +-
gtkdoc-scangobj.in | 2 +-
tests/tools.sh.in | 4 ++--
10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/gtkdoc-check.in b/gtkdoc-check.in
index 560d69b..b60857f 100755
--- a/gtkdoc-check.in
+++ b/gtkdoc-check.in
@@ -1,4 +1,4 @@
-#!@PERL@ -w
+#!/usr/bin/env perl
# -*- cperl -*-
#
# gtk-doc - GTK DocBook documentation generator.
diff --git a/gtkdoc-common.pl.in b/gtkdoc-common.pl.in
index 4747396..cfadb78 100644
--- a/gtkdoc-common.pl.in
+++ b/gtkdoc-common.pl.in
@@ -1,4 +1,4 @@
-#!@PERL@ -w
+#!/usr/bin/env perl
# -*- cperl -*-
#
# gtk-doc - GTK DocBook documentation generator.
diff --git a/gtkdoc-depscan.in b/gtkdoc-depscan.in
index 83af01b..917e247 100644
--- a/gtkdoc-depscan.in
+++ b/gtkdoc-depscan.in
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!/usr/bin/env python
import gzip, os.path, re
diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in
index 3d9e8d0..d55190b 100755
--- a/gtkdoc-fixxref.in
+++ b/gtkdoc-fixxref.in
@@ -1,4 +1,4 @@
-#!@PERL@ -w
+#!/usr/bin/env perl
# -*- cperl -*-
#
# gtk-doc - GTK DocBook documentation generator.
diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in
index 8dd6d5e..d808750 100755
--- a/gtkdoc-mkdb.in
+++ b/gtkdoc-mkdb.in
@@ -1,4 +1,4 @@
-#!@PERL@ -w
+#!/usr/bin/env perl
# -*- cperl -*-
#
# gtk-doc - GTK DocBook documentation generator.
diff --git a/gtkdoc-mktmpl.in b/gtkdoc-mktmpl.in
index c64dfd3..2f46c18 100755
--- a/gtkdoc-mktmpl.in
+++ b/gtkdoc-mktmpl.in
@@ -1,4 +1,4 @@
-#!@PERL@ -w
+#!/usr/bin/env perl
# -*- cperl -*-
#
# gtk-doc - GTK DocBook documentation generator.
diff --git a/gtkdoc-rebase.in b/gtkdoc-rebase.in
index 375482d..cf05b45 100644
--- a/gtkdoc-rebase.in
+++ b/gtkdoc-rebase.in
@@ -1,4 +1,4 @@
-#!@PERL@ -w
+#!/usr/bin/env perl
# -*- cperl -*-
#
# gtk-doc - GTK DocBook documentation generator.
diff --git a/gtkdoc-scan.in b/gtkdoc-scan.in
index 048e5c9..78c6136 100755
--- a/gtkdoc-scan.in
+++ b/gtkdoc-scan.in
@@ -1,4 +1,4 @@
-#!@PERL@ -w
+#!/usr/bin/env perl
# -*- cperl -*-
#
# gtk-doc - GTK DocBook documentation generator.
diff --git a/gtkdoc-scangobj.in b/gtkdoc-scangobj.in
index fb66b76..67ee8f7 100644
--- a/gtkdoc-scangobj.in
+++ b/gtkdoc-scangobj.in
@@ -1,4 +1,4 @@
-#!@PERL@ -w
+#!/usr/bin/env perl
# -*- cperl -*-
#
# gtk-doc - GTK DocBook documentation generator.
diff --git a/tests/tools.sh.in b/tests/tools.sh.in
index a114a42..7073883 100644
--- a/tests/tools.sh.in
+++ b/tests/tools.sh.in
@@ -11,7 +11,7 @@ echo "Running suite(s): gtk-doc-$suite";
# test perl scripts
for file in gtkdoc-check gtkdoc-fixxref gtkdoc-mkdb gtkdoc-mktmpl gtkdoc-rebase gtkdoc-scan gtkdoc-scangobj ; do
- @PERL@ -cwT `which $file`
+ perl -cwT `which $file`
if test $? = 1 ; then failed=`expr $failed + 1`; fi
tested=`expr $tested + 1`
done
@@ -34,7 +34,7 @@ done
# test python scripts
-@PYTHON@ -m py_compile `which gtkdoc-depscan`
+python -m py_compile `which gtkdoc-depscan`
if test $? != 0 ; then failed=`expr $failed + 1`; fi
tested=`expr $tested + 1`
--
2.9.3