Upstream has an autogen.sh which constructs a hand-written aclocal.m4
and manually copies libtool into place. Instead of working around the
bad interaction between these expectations and our autotools class we
can just disable the execution of aclocal in autoreconf and copy files
as autogen.sh does.
Signed-off-by: Ross Burton <ross.bur...@arm.com>
---
.../subversion/subversion_1.14.5.bb | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-devtools/subversion/subversion_1.14.5.bb
b/meta/recipes-devtools/subversion/subversion_1.14.5.bb
index b1347906204..56ef1019fc4 100644
--- a/meta/recipes-devtools/subversion/subversion_1.14.5.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.14.5.bb
@@ -35,18 +35,19 @@ EXTRA_OECONF = " \
ac_cv_path_RUBY=none \
"
+# Upstream puts the .pc in $datadir
EXTRA_OEMAKE += "pkgconfig_dir=${libdir}/pkgconfig"
-acpaths = "-I build/ -I build/ac-macros/"
-
CPPFLAGS += "-P"
BUILD_CPPFLAGS += "-P"
+EXTRA_AUTORECONF += "--exclude=aclocal"
+
do_configure:prepend () {
- rm -f ${S}/libtool
- rm -f ${S}/build/libtool.m4 ${S}/build/ltmain.sh
${S}/build/ltoptions.m4 ${S}/build/ltsugar.m4 ${S}/build/ltversion.m4
${S}/build/lt~obsolete.m4
- rm -f ${S}/aclocal.m4
- sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":'
${S}/build/ac-macros/sasl.m4
+ # autogen.sh manually puts things in the right place, and libtoolize
doesn't
+ # work as they don't use aclocal
+ cp -f ${S}/aclocal.m4.in ${S}/aclocal.m4
+ cp -f ${STAGING_DATADIR}/aclocal/libtool.m4
${STAGING_DATADIR}/aclocal/lt*.m4 ${S}/build/
}
#| x86_64-linux-libtool: install: warning:
`/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_ra_local/libsvn_ra_local-1.la'
has not been installed in
`/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'|
x86_64-linux-libtool: install: warning:
`/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_repos/libsvn_repos-1.la'
has not been installed in
`/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'|
/usr/bin/ld: cannot find -lsvn_delta-1| collect2: ld returned 1 exit status|
x86_64-linux-libtool: install: warning:
`/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_ra_svn/libsvn_ra_svn-1.la'
has not been installed in
`/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'|
x86_64-linux-libtool: install: warning:
`/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_ra_serf/libsvn_ra_serf-1.la'
has not been installed in
`/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'
--
2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#208912):
https://lists.openembedded.org/g/openembedded-core/message/208912
Mute This Topic: https://lists.openembedded.org/mt/110197923/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
