summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-09-08 14:49:24 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-14 22:22:12 +0100
commitf08aeff228bf04ba9b9facf90a805ad80363cf7b (patch)
treeb5c88444ae13d319d91f93a0c0191d362984b182 /meta/recipes-gnome
parent04e3dc6d3bab63ca2ee5b1f81aeda2482bfb42cf (diff)
downloadpoky-f08aeff228bf04ba9b9facf90a805ad80363cf7b.tar.gz
gtk-doc: require perl-native only if api-documentation feature is enabled
This should reduce build times. (From OE-Core rev: 74d9c5eb858bfe1dd16826b74be3af71bb1956d9) 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')
-rw-r--r--meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-perl-is-not-found-or-its-version.patch40
-rw-r--r--meta/recipes-gnome/gtk-doc/gtk-doc_1.25.bb8
2 files changed, 46 insertions, 2 deletions
diff --git a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-perl-is-not-found-or-its-version.patch b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-perl-is-not-found-or-its-version.patch
new file mode 100644
index 0000000000..4a9028742c
--- /dev/null
+++ b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-perl-is-not-found-or-its-version.patch
@@ -0,0 +1,40 @@
1From e733241fb580f032efbbe684ec35d4c9d27f1595 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 8 Sep 2016 13:38:39 +0300
4Subject: [PATCH] Do not error out if perl is not found or its version is too
5 old.
6
7This allows use to avoid depending on perl-native if we're not going
8to use it (when api-docs are disabled).
9
10Upstream-Status: Inappropriate [oe-core specific]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 configure.ac | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/configure.ac b/configure.ac
17index 2a61d6e..29415bd 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -36,7 +36,7 @@ dnl Check for Perl.
21 dnl
22 AC_PATH_PROG([PERL], [perl])
23 if test -z "$PERL"; then
24- AC_MSG_ERROR([perl not found])
25+ AC_MSG_WARN([perl not found])
26 fi
27
28 AC_MSG_CHECKING([if Perl version >= 5.18.0])
29@@ -44,7 +44,7 @@ if "$PERL" -e "require v5.18.0"; then
30 AC_MSG_RESULT([yes])
31 else
32 AC_MSG_RESULT([no])
33- AC_MSG_ERROR([perl >= 5.18.0 is required for gtk-doc])
34+ AC_MSG_WARN([perl >= 5.18.0 is required for gtk-doc])
35 fi
36
37 dnl
38--
392.9.3
40
diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.25.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.25.bb
index 3d1cdae385..6af996e359 100644
--- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.25.bb
+++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.25.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org/gtk-doc/"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
7 7
8inherit gnomebase perlnative 8inherit gnomebase
9 9
10# Configure the scripts correctly (and build their dependencies) only if they are actually 10# Configure the scripts correctly (and build their dependencies) only if they are actually
11# going to be used; otheriwse we need only the m4/makefile includes from the gtk-doc tarball. 11# going to be used; otheriwse we need only the m4/makefile includes from the gtk-doc tarball.
@@ -15,10 +15,14 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation",
15# into its scripts. This means that target gtk-doc package is broken; 15# into its scripts. This means that target gtk-doc package is broken;
16# hopefully no one minds because its scripts are not used for anything during build 16# hopefully no one minds because its scripts are not used for anything during build
17# and shouldn't be used on targets. 17# and shouldn't be used on targets.
18PACKAGECONFIG[working-scripts] = "--with-highlight=source-highlight,--with-highlight=no,libxslt-native xmlto-native source-highlight-native" 18PACKAGECONFIG[working-scripts] = "--with-highlight=source-highlight,--with-highlight=no,libxslt-native xmlto-native source-highlight-native perl-native"
19
20# We cannot use host perl, because it may be too old for gtk-doc
21EXTRANATIVEPATH += "perl-native"
19 22
20SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \ 23SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \
21 file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \ 24 file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \
25 file://0001-Do-not-error-out-if-perl-is-not-found-or-its-version.patch \
22 " 26 "
23SRC_URI_append_class-native = " file://pkg-config-native.patch" 27SRC_URI_append_class-native = " file://pkg-config-native.patch"
24 28