new file mode 100644
@@ -0,0 +1,60 @@
+From 5726409227cbc063219cf022b2dff16a87a6b7bc Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 20 Feb 2022 19:47:45 -0800
+Subject: [PATCH] automake: Fix out of tree builds
+
+Fixes
+| automake: error: cannot open < build/dist-changelog.am: No such file or directory
+| autoreconf: error: automake failed with exit status: 1
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile.am | 2 +-
+ docs/Makefile.am | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index ff59308..3afc5b8 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -44,4 +44,4 @@ install-ptest:
+ make -C examples install-ptest
+
+ # Optional: auto-generate the ChangeLog file from the git log on make dist
+-include $(top_srcdir)/build/dist-changelog.am
++include $(top_builddir)/build/dist-changelog.am
+diff --git a/docs/Makefile.am b/docs/Makefile.am
+index 8dfc7b2..fc83644 100644
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -19,7 +19,7 @@ book_name = $(LIBXMLXX_MODULE_NAME)
+ doc_input = $(addprefix $(top_srcdir)/libxml++/,$(h_sources_public))
+
+ # Sets dist_noinst_DATA, DISTCLEANFILES and MAINTAINERCLEANFILES
+-include $(top_srcdir)/build/doc-reference.am
++include $(top_builddir)/build/doc-reference.am
+
+ manual/libxml++.xml: ${top_srcdir}/docs/manual/libxml++_without_code.xml ${top_srcdir}/docs/manual/insert_example_code.pl
+ $(AM_V_at)$(MKDIR_P) manual
+@@ -46,7 +46,7 @@ validate_manual: manual/libxml++.xml
+
+ all-local: manual/html/index.html
+
+-dist_noinst_DATA += \
++dist_noinst_DATA = \
+ manual/docbook-customisation.xsl \
+ $(manual_html_files) \
+ manual/libxml++.xml \
+@@ -55,7 +55,7 @@ dist_noinst_DATA += \
+ dist_noinst_SCRIPTS = \
+ manual/insert_example_code.pl
+
+-MAINTAINERCLEANFILES += manual/html/*.html
++MAINTAINERCLEANFILES = manual/html/*.html
+
+ # Make it easy to upload to the sourceforge web site.
+ # The manual and API reference are hosted on developer.gnome.org via tarball releases.
+--
+2.35.1
+
@@ -1,20 +1,16 @@
-Index: libxml++-2.40.1/Makefile.am
-===================================================================
---- libxml++-2.40.1.orig/Makefile.am
-+++ libxml++-2.40.1/Makefile.am
-@@ -24,5 +24,8 @@ dist_noinst_SCRIPTS = autogen.sh
-
- DISTCLEANFILES = MSVC_Net2010/libxml++/libxml++config.h
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -40,5 +40,8 @@ EXTRA_DIST = \
+ tools/conf_tests/have_exception_ptr.cc \
+ untracked/README
+install-ptest:
+ make -C examples install-ptest
+
# Optional: auto-generate the ChangeLog file from the git log on make dist
include $(top_srcdir)/build/dist-changelog.am
-Index: libxml++-2.40.1/examples/Makefile.am
-===================================================================
---- libxml++-2.40.1.orig/examples/Makefile.am
-+++ libxml++-2.40.1/examples/Makefile.am
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
@@ -19,6 +19,8 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_
AM_CXXFLAGS = $(LIBXMLXX_WXXFLAGS)
LDADD = $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS)
@@ -51,10 +47,10 @@ Index: libxml++-2.40.1/examples/Makefile.am
@@ -154,10 +173,10 @@ dist_noinst_DATA = \
# file are located in different directories.
dom_read_write/make_check.sh: Makefile
- echo '# Generated and used by "make check"' >$@
-- echo 'dom_read_write/dom_read_write "$(srcdir)/dom_read_write/example.xml" dom_read_write/example_output.xml >/dev/null' >>$@
-+ echo 'cd dom_read_write && .libs/dom_read_write "example.xml" example_output.xml >/dev/null' >>$@
- chmod +x $@
+ $(AM_V_GEN)echo '# Generated and used by "make check"' >$@
+- $(AM_V_at)echo 'dom_read_write/dom_read_write "$(srcdir)/dom_read_write/example.xml" dom_read_write/example_output.xml >/dev/null' >>$@
++ $(AM_V_at)echo 'cd dom_read_write && .libs/dom_read_write "example.xml" example_output.xml >/dev/null' >>$@
+ $(AM_V_at)chmod +x $@
-script_template = cd "$(srcdir)/<!progname!>" && "$(abs_builddir)/<!progname!>/<!progname!>" >/dev/null
+script_template = cd "<!progname!>" && ".libs/<!progname!>" >/dev/null
similarity index 84%
rename from meta-oe/recipes-core/libxml/libxml++_2.40.1.bb
rename to meta-oe/recipes-core/libxml/libxml++_2.42.1.bb
@@ -9,10 +9,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 "
SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz \
file://libxml++_ptest.patch \
+ file://0001-automake-Fix-out-of-tree-builds.patch \
file://run-ptest \
"
-SRC_URI[md5sum] = "377a87bea899f2b4ff62df2418c3d8a6"
-SRC_URI[sha256sum] = "4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9"
+SRC_URI[sha256sum] = "9b59059abe5545d28ceb388a55e341095f197bd219c73e6623aeb6d801e00be8"
DEPENDS = "libxml2 glibmm"
fix build when S != B Signed-off-by: Khem Raj <raj.khem@gmail.com> --- ...0001-automake-Fix-out-of-tree-builds.patch | 60 +++++++++++++++++++ .../libxml/libxml++/libxml++_ptest.patch | 26 ++++---- ...{libxml++_2.40.1.bb => libxml++_2.42.1.bb} | 4 +- 3 files changed, 73 insertions(+), 17 deletions(-) create mode 100644 meta-oe/recipes-core/libxml/libxml++/0001-automake-Fix-out-of-tree-builds.patch rename meta-oe/recipes-core/libxml/{libxml++_2.40.1.bb => libxml++_2.42.1.bb} (84%)