[OE-core] [PATCH 6/9] gtk-doc: don't use docdir set in environment in gtkdocize
From: Ross Burton The gtkdocize script was accidentally respecting $docdir from the environment as the default documentation directory. This is a problem as bitbake.conf exports $docdir, resulting in configure failures. Signed-off-by: Ross Burton --- ...01-Don-t-use-docdir-from-environment.patch | 24 +++ meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb | 1 + 2 files changed, 25 insertions(+) create mode 100644 meta/recipes-gnome/gtk-doc/files/0001-Don-t-use-docdir-from-environment.patch diff --git a/meta/recipes-gnome/gtk-doc/files/0001-Don-t-use-docdir-from-environment.patch b/meta/recipes-gnome/gtk-doc/files/0001-Don-t-use-docdir-from-environment.patch new file mode 100644 index 000..f40124877c3 --- /dev/null +++ b/meta/recipes-gnome/gtk-doc/files/0001-Don-t-use-docdir-from-environment.patch @@ -0,0 +1,24 @@ +From 72dfeec0e49478b0bfb471c4155044391bad8e6c Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Fri, 8 Dec 2023 10:35:25 + +Subject: [PATCH] Don't use docdir from environment + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gtk-doc/-/merge_requests/73] +Signed-off-by: Ross Burton +--- + buildsystems/autotools/gtkdocize.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/buildsystems/autotools/gtkdocize.in b/buildsystems/autotools/gtkdocize.in +index 83127bf..76dcbfd 100755 +--- a/buildsystems/autotools/gtkdocize.in b/buildsystems/autotools/gtkdocize.in +@@ -39,7 +39,7 @@ set - $args + + # assume working directory if srcdir is not set + test "$srcdir" || srcdir=. +-test "$docdir" || docdir="$srcdir" ++docdir="$srcdir" + + # detect configure script + no_configure_found=0 diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb index f2f37610f9e..4fd5a6e9256 100644 --- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb +++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb @@ -26,6 +26,7 @@ SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \ file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \ file://conditionaltests.patch \ file://no-clobber.patch \ + file://0001-Don-t-use-docdir-from-environment.patch \ " SRC_URI:append:class-native = " file://pkg-config-native.patch" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#193505): https://lists.openembedded.org/g/openembedded-core/message/193505 Mute This Topic: https://lists.openembedded.org/mt/103639980/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 6/9] gtk-doc: don't use docdir set in environment in gtkdocize
From: Ross Burton The gtkdocize script was accidentally respecting $docdir from the environment as the default documentation directory. This is a problem as bitbake.conf exports $docdir, resulting in configure failures. Signed-off-by: Ross Burton --- ...01-Don-t-use-docdir-from-environment.patch | 24 +++ meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb | 1 + 2 files changed, 25 insertions(+) create mode 100644 meta/recipes-gnome/gtk-doc/files/0001-Don-t-use-docdir-from-environment.patch diff --git a/meta/recipes-gnome/gtk-doc/files/0001-Don-t-use-docdir-from-environment.patch b/meta/recipes-gnome/gtk-doc/files/0001-Don-t-use-docdir-from-environment.patch new file mode 100644 index 000..f40124877c3 --- /dev/null +++ b/meta/recipes-gnome/gtk-doc/files/0001-Don-t-use-docdir-from-environment.patch @@ -0,0 +1,24 @@ +From 72dfeec0e49478b0bfb471c4155044391bad8e6c Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Fri, 8 Dec 2023 10:35:25 + +Subject: [PATCH] Don't use docdir from environment + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gtk-doc/-/merge_requests/73] +Signed-off-by: Ross Burton +--- + buildsystems/autotools/gtkdocize.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/buildsystems/autotools/gtkdocize.in b/buildsystems/autotools/gtkdocize.in +index 83127bf..76dcbfd 100755 +--- a/buildsystems/autotools/gtkdocize.in b/buildsystems/autotools/gtkdocize.in +@@ -39,7 +39,7 @@ set - $args + + # assume working directory if srcdir is not set + test "$srcdir" || srcdir=. +-test "$docdir" || docdir="$srcdir" ++docdir="$srcdir" + + # detect configure script + no_configure_found=0 diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb index 2e8ab1c771a..7c366737da5 100644 --- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb +++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb @@ -26,6 +26,7 @@ SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \ file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \ file://conditionaltests.patch \ file://no-clobber.patch \ + file://0001-Don-t-use-docdir-from-environment.patch \ " SRC_URI:append:class-native = " file://pkg-config-native.patch" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192199): https://lists.openembedded.org/g/openembedded-core/message/192199 Mute This Topic: https://lists.openembedded.org/mt/103129929/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
