mirror of
https://git.yoctoproject.org/poky
synced 2026-04-18 03:32:13 +02:00
eudev: Convert dependencies to PACKAGECONFIG
GObject support was dropped in 252150e181c5 ("src/gudev: remove Gobject
libudev support."), drop all g-i-r support which appears to be dead
upstream.
Fill out PACKAGECONFIG options.
(From OE-Core rev: c6e1483009fc67a5b0e192786b58f256a38f62f7)
Signed-off-by: Alex Kiernan <alexk@zuma.ai>
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alex Kiernan
committed by
Richard Purdie
Richard Purdie
parent
b0d39aa3d2
commit
b4969db127
@@ -0,0 +1,155 @@
|
||||
From 520c4d451efc488573746f169d8e47d5a131afc2 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Kiernan <alex.kiernan@gmail.com>
|
||||
Date: Fri, 20 May 2022 09:35:08 +0100
|
||||
Subject: [PATCH] build: Remove dead g-i-r configuration
|
||||
|
||||
g-i-r support was removed in 2015 as part of removal of Gobject libudev
|
||||
support, but the autoconf support wasn't removed but is dead.
|
||||
|
||||
Fixes: 252150e181c5 ("src/gudev: remove Gobject libudev support.")
|
||||
Upstream-Status: Submitted [https://github.com/eudev-project/eudev/pull/231]
|
||||
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
|
||||
Signed-off-by: Alex Kiernan <alex.kiernan@zuma.ai>
|
||||
---
|
||||
configure.ac | 12 ------
|
||||
m4/introspection.m4 | 96 ---------------------------------------------
|
||||
2 files changed, 108 deletions(-)
|
||||
delete mode 100644 m4/introspection.m4
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 85a524a618ae..987d5037ae77 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -183,17 +183,8 @@ AC_SUBST([udevrulesdir],[${udevlibexecdir}/rules.d])
|
||||
AC_SUBST([pkgconfiglibdir], [${libdir}/pkgconfig])
|
||||
AC_SUBST([sharepkgconfigdir],[${datadir}/pkgconfig])
|
||||
|
||||
-# introspection paths
|
||||
-AC_SUBST([girdir], [${datadir}/gir-1.0])
|
||||
-AC_SUBST([typelibsdir], [${libdir}/girepository-1.0])
|
||||
-
|
||||
AC_SUBST([rootrundir],[${with_rootrundir}])
|
||||
|
||||
-# ------------------------------------------------------------------------------
|
||||
-
|
||||
-GOBJECT_INTROSPECTION_CHECK([1.31.1])
|
||||
-AM_CONDITIONAL([HAVE_INTROSPECTION], [test "$enable_introspection" = "yes"])
|
||||
-
|
||||
# ------------------------------------------------------------------------------
|
||||
AC_ARG_ENABLE([programs],
|
||||
AS_HELP_STRING([--disable-programs], [disable programs (udevd, udevadm and helpers)]),
|
||||
@@ -349,9 +340,6 @@ AC_MSG_RESULT([
|
||||
|
||||
pkgconfiglibdir: ${libdir}/pkgconfig
|
||||
sharepkgconfigdir ${datadir}/pkgconfig
|
||||
-
|
||||
- girdir ${datadir}/gir-1.0
|
||||
- typelibsdir ${libdir}/girepository-1.0
|
||||
])
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
diff --git a/m4/introspection.m4 b/m4/introspection.m4
|
||||
deleted file mode 100644
|
||||
index d89c3d907d9c..000000000000
|
||||
--- a/m4/introspection.m4
|
||||
+++ /dev/null
|
||||
@@ -1,96 +0,0 @@
|
||||
-dnl -*- mode: autoconf -*-
|
||||
-dnl Copyright 2009 Johan Dahlin
|
||||
-dnl
|
||||
-dnl This file is free software; the author(s) gives unlimited
|
||||
-dnl permission to copy and/or distribute it, with or without
|
||||
-dnl modifications, as long as this notice is preserved.
|
||||
-dnl
|
||||
-
|
||||
-# serial 1
|
||||
-
|
||||
-m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
|
||||
-[
|
||||
- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
|
||||
- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
|
||||
- AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
|
||||
-
|
||||
- dnl enable/disable introspection
|
||||
- m4_if([$2], [require],
|
||||
- [dnl
|
||||
- enable_introspection=yes
|
||||
- ],[dnl
|
||||
- AC_ARG_ENABLE(introspection,
|
||||
- AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
|
||||
- [Enable introspection for this build]),,
|
||||
- [enable_introspection=auto])
|
||||
- ])dnl
|
||||
-
|
||||
- AC_MSG_CHECKING([for gobject-introspection])
|
||||
-
|
||||
- dnl presence/version checking
|
||||
- AS_CASE([$enable_introspection],
|
||||
- [no], [dnl
|
||||
- found_introspection="no (disabled, use --enable-introspection to enable)"
|
||||
- ],dnl
|
||||
- [yes],[dnl
|
||||
- PKG_CHECK_EXISTS([gobject-introspection-1.0],,
|
||||
- AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
|
||||
- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
|
||||
- found_introspection=yes,
|
||||
- AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
|
||||
- ],dnl
|
||||
- [auto],[dnl
|
||||
- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
|
||||
- dnl Canonicalize enable_introspection
|
||||
- enable_introspection=$found_introspection
|
||||
- ],dnl
|
||||
- [dnl
|
||||
- AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
|
||||
- ])dnl
|
||||
-
|
||||
- AC_MSG_RESULT([$found_introspection])
|
||||
-
|
||||
- INTROSPECTION_SCANNER=
|
||||
- INTROSPECTION_COMPILER=
|
||||
- INTROSPECTION_GENERATE=
|
||||
- INTROSPECTION_GIRDIR=
|
||||
- INTROSPECTION_TYPELIBDIR=
|
||||
- if test "x$found_introspection" = "xyes"; then
|
||||
- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
|
||||
- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
|
||||
- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
|
||||
- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
|
||||
- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
|
||||
- INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
|
||||
- INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
|
||||
- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
|
||||
- fi
|
||||
- AC_SUBST(INTROSPECTION_SCANNER)
|
||||
- AC_SUBST(INTROSPECTION_COMPILER)
|
||||
- AC_SUBST(INTROSPECTION_GENERATE)
|
||||
- AC_SUBST(INTROSPECTION_GIRDIR)
|
||||
- AC_SUBST(INTROSPECTION_TYPELIBDIR)
|
||||
- AC_SUBST(INTROSPECTION_CFLAGS)
|
||||
- AC_SUBST(INTROSPECTION_LIBS)
|
||||
- AC_SUBST(INTROSPECTION_MAKEFILE)
|
||||
-
|
||||
- AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
|
||||
-])
|
||||
-
|
||||
-
|
||||
-dnl Usage:
|
||||
-dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
|
||||
-
|
||||
-AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
|
||||
-[
|
||||
- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
|
||||
-])
|
||||
-
|
||||
-dnl Usage:
|
||||
-dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
|
||||
-
|
||||
-
|
||||
-AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
|
||||
-[
|
||||
- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
|
||||
-])
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@@ -5,13 +5,14 @@ LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
|
||||
LICENSE:libudev = "LGPL-2.1-or-later"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
||||
|
||||
DEPENDS = "glib-2.0 glib-2.0-native gperf-native kmod util-linux"
|
||||
DEPENDS = "gperf-native"
|
||||
|
||||
PROVIDES = "udev"
|
||||
|
||||
SRC_URI = "https://github.com/eudev-project/${BPN}/releases/download/v${PV}/${BP}.tar.gz \
|
||||
file://init \
|
||||
file://local.rules \
|
||||
file://0001-build-Remove-dead-g-i-r-configuration.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "19847cafec67897da855fde56f9dc7d92e21c50e450aa79068a7e704ed44558b"
|
||||
@@ -30,11 +31,14 @@ EXTRA_OECONF = " \
|
||||
--with-rootprefix= \
|
||||
"
|
||||
|
||||
PACKAGECONFIG ?= "hwdb \
|
||||
PACKAGECONFIG ?= "blkid hwdb kmod \
|
||||
${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \
|
||||
"
|
||||
PACKAGECONFIG[blkid] = "--enable-blkid,--disable-blkid,util-linux"
|
||||
PACKAGECONFIG[hwdb] = "--enable-hwdb,--disable-hwdb"
|
||||
PACKAGECONFIG[kmod] = "--enable-kmod,--disable-kmod,kmod"
|
||||
PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages"
|
||||
PACKAGECONFIG[rule-generator] = "--enable-rule-generator,--disable-rule-generator"
|
||||
PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
|
||||
|
||||
do_install:append() {
|
||||
|
||||
Reference in New Issue
Block a user