CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

libgphoto2: remove redundant autoconfing

Browse Source 
The configure scripts do the right thing now, so there's no need to
patch configure.ac or manually invoke the sub-configure.

Also remove obsolete FILES, -dbg is packaged automatically and we don't
install .la files.

Signed-off-by: Ross Burton <ross.burton@arm.com>
This commit is contained in:
Ross Burton 2025-02-25 16:58:40 +00:00
parent 77c1c65dcf
commit 5fdfe5b2ff
2 changed files with 0 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch
View File

@ -1,41 +0,0 @@
From 31a5d2f7db18737aef08c34e8707b4f69f7e5156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 21 Oct 2012 17:59:20 +0200
Subject: [PATCH] configure.ac: remove AM_PO_SUBDIRS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
together with oe autotools.bbclass this is done twice and causes:
| autoreconf: running: aclocal --system-acdir=/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/aclocal-copy/ --automake-acdir=/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/share/aclocal-1.12 -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/auto-m4/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/m4m/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/auto-m4/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/m4m/ --force -I auto-m4 -I m4m
| configure.ac:230: error: `po-directories' is already registered with AC_CONFIG_COMMANDS.
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
configure.ac | 1 -
libgphoto2_port/configure.ac | 1 -
2 files changed, 0 insertions(+), 2 deletions(-)
--- a/configure.ac
+++ b/configure.ac
@@ -282,7 +282,6 @@ dnl ------------------------------------
GP_GETTEXT_SETUP([GETTEXT_PACKAGE_LIBGPHOTO2],
[${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],
[po])
-AM_PO_SUBDIRS()
AM_GNU_GETTEXT_VERSION([0.19.1])
AM_GNU_GETTEXT([external])
AM_ICONV()
--- a/libgphoto2_port/configure.ac
+++ b/libgphoto2_port/configure.ac
@@ -122,7 +122,6 @@ dnl ------------------------------------
GP_GETTEXT_SETUP([GETTEXT_PACKAGE_LIBGPHOTO2_PORT],
[${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}],
[po])
-AM_PO_SUBDIRS()
AM_GNU_GETTEXT_VERSION([0.19.1])
AM_GNU_GETTEXT([external])
AM_ICONV()

15
meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb
View File

@ -11,7 +11,6 @@ DEPENDS = "libtool jpeg virtual/libusb0 libexif zlib libxml2"
SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 \
file://40-libgphoto2.rules \
file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \
file://0001-configure-Filter-out-buildpaths-from-CC.patch \
file://fix-build-with-gcc-14.patch \
"
@ -25,18 +24,6 @@ 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/
autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths
cd ${S}
}
do_install:append() {
install -d ${D}${sysconfdir}/udev/rules.d/
install -m 0644 ${UNPACKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
@ -49,6 +36,4 @@ RRECOMMENDS:${PN} = "libgphoto2-camlibs"
FILES:libgphotoport = "${libdir}/libgphoto2_port.so.*"
FILES:${PN} += "${nonarch_base_libdir}/udev/*"
FILES:${PN}-dbg += "${libdir}/*/*/.debug"
FILES:${PN}-dev += "${libdir}/*/*/*.la"
FILES:${PN}-doc += "${datadir}/libgphoto2_port/0.12.?/vcamera/README.txt"