diff options
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 | 155 |
1 files changed, 79 insertions, 76 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 index 477fc9ae8c..2fe3ab9221 100644 --- 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 @@ -1,7 +1,7 @@ -From 6fab82b93c7bd301eb42448515b02f7cb3306897 Mon Sep 17 00:00:00 2001 +From 928102874bc2339a1d57c6b178877e0c6002cb3a 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. +Subject: [PATCH 1/3] 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 @@ -9,131 +9,134 @@ 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(-) + gtkdoc-check.in | 2 +- + gtkdoc-depscan.in | 2 +- + gtkdoc-fixxref.in | 2 +- + gtkdoc-mkdb.in | 2 +- + gtkdoc-mkhtml.in | 2 +- + gtkdoc-mkman.in | 2 +- + gtkdoc-mkpdf.in | 2 +- + gtkdoc-rebase.in | 2 +- + gtkdoc-scan.in | 2 +- + gtkdoc-scangobj.in | 2 +- + tests/tools.sh.in | 2 +- + 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gtkdoc-check.in b/gtkdoc-check.in -index 560d69b..b60857f 100755 +index 8c8e917..f6a25f6 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 -*- +-#!@PYTHON@ ++#!/usr/bin/env python3 + # -*- python; coding: utf-8 -*- # # gtk-doc - GTK DocBook documentation generator. diff --git a/gtkdoc-depscan.in b/gtkdoc-depscan.in -index 83af01b..917e247 100644 +index 9bfaf30..aadc952 100644 --- a/gtkdoc-depscan.in +++ b/gtkdoc-depscan.in @@ -1,4 +1,4 @@ -#!@PYTHON@ -+#!/usr/bin/env python ++#!/usr/bin/env python3 - import gzip, os.path, re + from __future__ import print_function diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in -index 3d9e8d0..d55190b 100755 +index 0ea02d4..bdd443a 100755 --- a/gtkdoc-fixxref.in +++ b/gtkdoc-fixxref.in @@ -1,4 +1,4 @@ --#!@PERL@ -w -+#!/usr/bin/env perl - # -*- cperl -*- +-#!@PYTHON@ ++#!/usr/bin/env python3 + # -*- python -*- # # gtk-doc - GTK DocBook documentation generator. diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in -index 8dd6d5e..d808750 100755 +index 42d5731..3a56d56 100755 --- a/gtkdoc-mkdb.in +++ b/gtkdoc-mkdb.in @@ -1,4 +1,4 @@ --#!@PERL@ -w -+#!/usr/bin/env perl - # -*- cperl -*- +-#!@PYTHON@ ++#!/usr/bin/env python3 + # -*- python; coding: utf-8 -*- + # + # gtk-doc - GTK DocBook documentation generator. +diff --git a/gtkdoc-mkhtml.in b/gtkdoc-mkhtml.in +index 0d0a15d..914ff55 100644 +--- a/gtkdoc-mkhtml.in ++++ b/gtkdoc-mkhtml.in +@@ -1,4 +1,4 @@ +-#!@PYTHON@ ++#!/usr/bin/env python3 + # -*- python; coding: utf-8 -*- # # 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 +diff --git a/gtkdoc-mkman.in b/gtkdoc-mkman.in +index c5445cd..65db71a 100644 +--- a/gtkdoc-mkman.in ++++ b/gtkdoc-mkman.in @@ -1,4 +1,4 @@ --#!@PERL@ -w -+#!/usr/bin/env perl - # -*- cperl -*- +-#!@PYTHON@ ++#!/usr/bin/env python3 + # -*- python; coding: utf-8 -*- + # + # gtk-doc - GTK DocBook documentation generator. +diff --git a/gtkdoc-mkpdf.in b/gtkdoc-mkpdf.in +index e8c0c03..f807236 100755 +--- a/gtkdoc-mkpdf.in ++++ b/gtkdoc-mkpdf.in +@@ -1,4 +1,4 @@ +-#!@PYTHON@ ++#!/usr/bin/env python3 + # -*- python; coding: utf-8 -*- # # gtk-doc - GTK DocBook documentation generator. diff --git a/gtkdoc-rebase.in b/gtkdoc-rebase.in -index 375482d..cf05b45 100644 +index 17a71c2..ec3fd28 100755 --- a/gtkdoc-rebase.in +++ b/gtkdoc-rebase.in @@ -1,4 +1,4 @@ --#!@PERL@ -w -+#!/usr/bin/env perl - # -*- cperl -*- +-#!@PYTHON@ ++#!/usr/bin/env python3 + # -*- python -*- # # gtk-doc - GTK DocBook documentation generator. diff --git a/gtkdoc-scan.in b/gtkdoc-scan.in -index 048e5c9..78c6136 100755 +index 954c811..f461504 100755 --- a/gtkdoc-scan.in +++ b/gtkdoc-scan.in @@ -1,4 +1,4 @@ --#!@PERL@ -w -+#!/usr/bin/env perl - # -*- cperl -*- +-#!@PYTHON@ ++#!/usr/bin/env python3 + # -*- python -*- # # gtk-doc - GTK DocBook documentation generator. diff --git a/gtkdoc-scangobj.in b/gtkdoc-scangobj.in -index fb66b76..67ee8f7 100644 +index 4cbe130..52c2c24 100644 --- a/gtkdoc-scangobj.in +++ b/gtkdoc-scangobj.in @@ -1,4 +1,4 @@ --#!@PERL@ -w -+#!/usr/bin/env perl - # -*- cperl -*- +-#!@PYTHON@ ++#!/usr/bin/env python3 + # -*- python -*- # # gtk-doc - GTK DocBook documentation generator. diff --git a/tests/tools.sh.in b/tests/tools.sh.in -index a114a42..7073883 100644 +index 4d301d0..565fc1e 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` +@@ -31,7 +31,7 @@ done + # TODO: test python 2 and 3 (python3 -mcompileall gtkdoc/*.py) + for file in gtkdoc-check gtkdoc-depscan gtkdoc-fixxref gtkdoc-mkdb gtkdoc-mkhtml gtkdoc-mkman gtkdoc-mkpdf gtkdoc-rebase gtkdoc-scangobj; do + fullfile=`which $file` +- @PYTHON@ -m py_compile $fullfile ++ python3 -m py_compile $fullfile + if test $? != 0 ; 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 +2.14.1 |