diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-07-13 17:43:37 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-09 12:12:22 +0100 |
| commit | 5029d1fb1523e111df482c2a6f69ac9758310691 (patch) | |
| tree | 8bd1379f0e19e4736343070689adc1934883da48 /meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch | |
| parent | 94317f52cec76eeec6dcf885cd1e83dc37f40614 (diff) | |
| download | poky-5029d1fb1523e111df482c2a6f69ac9758310691.tar.gz | |
gtk-doc: add a recipe, remove gtk-doc-stub
(From OE-Core rev: 8b958312d360e6692dc7c6dd3d2b2591301f9e59)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch')
| -rw-r--r-- | meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch | 139 |
1 files changed, 139 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch new file mode 100644 index 0000000000..477fc9ae8c --- /dev/null +++ b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch | |||
| @@ -0,0 +1,139 @@ | |||
| 1 | From 6fab82b93c7bd301eb42448515b02f7cb3306897 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Wed, 31 Aug 2016 16:44:46 +0300 | ||
| 4 | Subject: [PATCH] Do not hardocode paths to perl/python in scripts. | ||
| 5 | |||
| 6 | Doing so when the interpreters are somewhere deep in a sysroot directory | ||
| 7 | can reach the shebang line limit, and resulting scripts wouldn't work | ||
| 8 | on targets either. | ||
| 9 | |||
| 10 | Upstream-Status: Inappropriate [oe-core specific] | ||
| 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 12 | --- | ||
| 13 | gtkdoc-check.in | 2 +- | ||
| 14 | gtkdoc-common.pl.in | 2 +- | ||
| 15 | gtkdoc-depscan.in | 2 +- | ||
| 16 | gtkdoc-fixxref.in | 2 +- | ||
| 17 | gtkdoc-mkdb.in | 2 +- | ||
| 18 | gtkdoc-mktmpl.in | 2 +- | ||
| 19 | gtkdoc-rebase.in | 2 +- | ||
| 20 | gtkdoc-scan.in | 2 +- | ||
| 21 | gtkdoc-scangobj.in | 2 +- | ||
| 22 | tests/tools.sh.in | 4 ++-- | ||
| 23 | 10 files changed, 11 insertions(+), 11 deletions(-) | ||
| 24 | |||
| 25 | diff --git a/gtkdoc-check.in b/gtkdoc-check.in | ||
| 26 | index 560d69b..b60857f 100755 | ||
| 27 | --- a/gtkdoc-check.in | ||
| 28 | +++ b/gtkdoc-check.in | ||
| 29 | @@ -1,4 +1,4 @@ | ||
| 30 | -#!@PERL@ -w | ||
| 31 | +#!/usr/bin/env perl | ||
| 32 | # -*- cperl -*- | ||
| 33 | # | ||
| 34 | # gtk-doc - GTK DocBook documentation generator. | ||
| 35 | diff --git a/gtkdoc-common.pl.in b/gtkdoc-common.pl.in | ||
| 36 | index 4747396..cfadb78 100644 | ||
| 37 | --- a/gtkdoc-common.pl.in | ||
| 38 | +++ b/gtkdoc-common.pl.in | ||
| 39 | @@ -1,4 +1,4 @@ | ||
| 40 | -#!@PERL@ -w | ||
| 41 | +#!/usr/bin/env perl | ||
| 42 | # -*- cperl -*- | ||
| 43 | # | ||
| 44 | # gtk-doc - GTK DocBook documentation generator. | ||
| 45 | diff --git a/gtkdoc-depscan.in b/gtkdoc-depscan.in | ||
| 46 | index 83af01b..917e247 100644 | ||
| 47 | --- a/gtkdoc-depscan.in | ||
| 48 | +++ b/gtkdoc-depscan.in | ||
| 49 | @@ -1,4 +1,4 @@ | ||
| 50 | -#!@PYTHON@ | ||
| 51 | +#!/usr/bin/env python | ||
| 52 | |||
| 53 | import gzip, os.path, re | ||
| 54 | |||
| 55 | diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in | ||
| 56 | index 3d9e8d0..d55190b 100755 | ||
| 57 | --- a/gtkdoc-fixxref.in | ||
| 58 | +++ b/gtkdoc-fixxref.in | ||
| 59 | @@ -1,4 +1,4 @@ | ||
| 60 | -#!@PERL@ -w | ||
| 61 | +#!/usr/bin/env perl | ||
| 62 | # -*- cperl -*- | ||
| 63 | # | ||
| 64 | # gtk-doc - GTK DocBook documentation generator. | ||
| 65 | diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in | ||
| 66 | index 8dd6d5e..d808750 100755 | ||
| 67 | --- a/gtkdoc-mkdb.in | ||
| 68 | +++ b/gtkdoc-mkdb.in | ||
| 69 | @@ -1,4 +1,4 @@ | ||
| 70 | -#!@PERL@ -w | ||
| 71 | +#!/usr/bin/env perl | ||
| 72 | # -*- cperl -*- | ||
| 73 | # | ||
| 74 | # gtk-doc - GTK DocBook documentation generator. | ||
| 75 | diff --git a/gtkdoc-mktmpl.in b/gtkdoc-mktmpl.in | ||
| 76 | index c64dfd3..2f46c18 100755 | ||
| 77 | --- a/gtkdoc-mktmpl.in | ||
| 78 | +++ b/gtkdoc-mktmpl.in | ||
| 79 | @@ -1,4 +1,4 @@ | ||
| 80 | -#!@PERL@ -w | ||
| 81 | +#!/usr/bin/env perl | ||
| 82 | # -*- cperl -*- | ||
| 83 | # | ||
| 84 | # gtk-doc - GTK DocBook documentation generator. | ||
| 85 | diff --git a/gtkdoc-rebase.in b/gtkdoc-rebase.in | ||
| 86 | index 375482d..cf05b45 100644 | ||
| 87 | --- a/gtkdoc-rebase.in | ||
| 88 | +++ b/gtkdoc-rebase.in | ||
| 89 | @@ -1,4 +1,4 @@ | ||
| 90 | -#!@PERL@ -w | ||
| 91 | +#!/usr/bin/env perl | ||
| 92 | # -*- cperl -*- | ||
| 93 | # | ||
| 94 | # gtk-doc - GTK DocBook documentation generator. | ||
| 95 | diff --git a/gtkdoc-scan.in b/gtkdoc-scan.in | ||
| 96 | index 048e5c9..78c6136 100755 | ||
| 97 | --- a/gtkdoc-scan.in | ||
| 98 | +++ b/gtkdoc-scan.in | ||
| 99 | @@ -1,4 +1,4 @@ | ||
| 100 | -#!@PERL@ -w | ||
| 101 | +#!/usr/bin/env perl | ||
| 102 | # -*- cperl -*- | ||
| 103 | # | ||
| 104 | # gtk-doc - GTK DocBook documentation generator. | ||
| 105 | diff --git a/gtkdoc-scangobj.in b/gtkdoc-scangobj.in | ||
| 106 | index fb66b76..67ee8f7 100644 | ||
| 107 | --- a/gtkdoc-scangobj.in | ||
| 108 | +++ b/gtkdoc-scangobj.in | ||
| 109 | @@ -1,4 +1,4 @@ | ||
| 110 | -#!@PERL@ -w | ||
| 111 | +#!/usr/bin/env perl | ||
| 112 | # -*- cperl -*- | ||
| 113 | # | ||
| 114 | # gtk-doc - GTK DocBook documentation generator. | ||
| 115 | diff --git a/tests/tools.sh.in b/tests/tools.sh.in | ||
| 116 | index a114a42..7073883 100644 | ||
| 117 | --- a/tests/tools.sh.in | ||
| 118 | +++ b/tests/tools.sh.in | ||
| 119 | @@ -11,7 +11,7 @@ echo "Running suite(s): gtk-doc-$suite"; | ||
| 120 | |||
| 121 | # test perl scripts | ||
| 122 | for file in gtkdoc-check gtkdoc-fixxref gtkdoc-mkdb gtkdoc-mktmpl gtkdoc-rebase gtkdoc-scan gtkdoc-scangobj ; do | ||
| 123 | - @PERL@ -cwT `which $file` | ||
| 124 | + perl -cwT `which $file` | ||
| 125 | if test $? = 1 ; then failed=`expr $failed + 1`; fi | ||
| 126 | tested=`expr $tested + 1` | ||
| 127 | done | ||
| 128 | @@ -34,7 +34,7 @@ done | ||
| 129 | |||
| 130 | |||
| 131 | # test python scripts | ||
| 132 | -@PYTHON@ -m py_compile `which gtkdoc-depscan` | ||
| 133 | +python -m py_compile `which gtkdoc-depscan` | ||
| 134 | if test $? != 0 ; then failed=`expr $failed + 1`; fi | ||
| 135 | tested=`expr $tested + 1` | ||
| 136 | |||
| 137 | -- | ||
| 138 | 2.9.3 | ||
| 139 | |||
