Skip to contentSkip to conversation

libgphoto: Fix build with libtool 2.4.7

PATCH New Khem Raj 1 participant 3 messages Mar 19, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/3 libgphoto: Fix build with libtool 2.4.7

Delete old m4 macros, so autoreconf can repopulate it.

---
 meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.27.bb | 5 +++++
 1 file changed, 5 insertions(+)
meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.27.bb +5 -0
index cb289751ea..41600be2e1 100644
@@ -25,6 +25,11 @@ PACKAGECONFIG ??= ""
 PACKAGECONFIG[gd] = ",--without-gdlib,gd"
 PACKAGECONFIG[serial] = "--enable-serial,--disable-serial,lockdev"
 
+do_configure:prepend() {
+    rm -rf ${S}/libgphoto2_port/auto-m4/*
+    rm -rf ${S}/auto-m4/*
+}
+
 do_configure:append() {
     cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/libgphoto2_port/po/
     cd ${S}/libgphoto2_port/
Signature · 1 line
2.35.1
author
#1 lore raw

PATCH 2/3 monit: Fix build with libtool 2.4.7

Delete old m4 macros, so autoreconf can repopulate it.

Fixes
libtool: Version mismatch error. This is libtool 2.4.7, but the
libtool: definition of this LT_INIT comes from libtool 2.4.6.
libtool: You should recreate aclocal.m4 with macros from libtool 2.4.7
libtool: and run autoconf again.

---
 meta-oe/recipes-support/monit/monit_5.31.0.bb | 4 ++++
 1 file changed, 4 insertions(+)
meta-oe/recipes-support/monit/monit_5.31.0.bb +4 -0
index fa51e05418..2b5e89420c 100644
@@ -38,6 +38,10 @@ INITSCRIPT_PACKAGES = "${PN}"
 INITSCRIPT_NAME:${PN} = "monit"
 INITSCRIPT_PARAMS:${PN} = "defaults 89"
 
+do_configure:prepend() {
+    rm -rf ${S}/m4/*
+}
+
 do_install:append() {
 
     # Configuration file
Signature · 1 line
2.35.1
author
#2 lore raw

PATCH 3/3 uim: Fix build with libtool 2.4.7

In reply to Khem Raj

Delete old m4 macros, so autoreconf can repopulate it.

Fixes

libtool: Version mismatch error. This is libtool 2.4.7, but the
libtool: definition of this LT_INIT comes from libtool 2.4.6.
libtool: You should recreate aclocal.m4 with macros from libtool 2.4.7
libtool: and run autoconf again.

---
 meta-oe/recipes-support/uim/uim_1.8.8.bb | 3 +++
 1 file changed, 3 insertions(+)
meta-oe/recipes-support/uim/uim_1.8.8.bb +3 -0
index fca914ed67..e0d9d05dce 100644
@@ -51,6 +51,9 @@ PARALLEL_MAKE = ""
 
 #Because m4 file's find maxdepth=2, so copy the m4 files of the deep depth.
 do_configure:prepend () {
+    rm -rf ${S}/m4.generated/lt*.m4 ${S}/m4.generated/libtool.m4
+    rm -rf ${S}/sigscheme/libgcroots/m4/lt*.m4 ${S}/sigscheme/libgcroots/m4/libtool.m4
+    rm -rf ${S}/sigscheme/m4/lt*.m4 ${S}/sigscheme/m4/libtool.m4
     cp ${S}/sigscheme/m4/* ${S}/m4/
 }
 
Signature · 1 line
2.35.1