MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-12-14 14:25:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

augeas: Check for __GLIBC__ to use gnu extention for strerror_r

Browse Source 
Merge .bb and .inc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2022-09-03 01:26:48 -07:00
parent c5f7b7eb69
commit aca683fb18
3 changed files with 67 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
meta-oe/recipes-support/augeas/augeas.inc
View File

@ -1,33 +0,0 @@
SUMMARY = "Augeas configuration API"
HOMEPAGE = "http://augeas.net/"
BUGTRACKER = "https://fedorahosted.org/augeas/report/1"
LICENSE = "LGPL-2.1-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff"
SRC_URI = "http://download.augeas.net/${BP}.tar.gz \
file://sepbuildfix.patch \
"
DEPENDS = "readline libxml2"
inherit autotools pkgconfig
PACKAGES =+ "${PN}-lenses lib${BPN}"
FILES:${PN}-lenses = "${datadir}/augeas/lenses"
FILES:lib${BPN} = "${libdir}/lib*${SOLIBS}"
RDEPENDS:lib${BPN} += "${PN}-lenses"
RRECOMMENDS:lib${BPN} += "${PN}"
LEAD_SONAME = "libaugeas.so"
do_install:append() {
rm -fr ${D}${datadir}/vim
}
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}"
PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
EXTRA_AUTORECONF += "-I ${S}/gnulib/m4"

34
meta-oe/recipes-support/augeas/augeas/0001-src-internal-Use-__GLIBC__-to-check-for-GNU-extentio.patch Normal file
View File

@ -0,0 +1,34 @@
From e5ccf769c2dc7283b56a597fffdb5dc1558e3ce8 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 3 Sep 2022 01:23:28 -0700
Subject: [PATCH] src/internal: Use __GLIBC__ to check for GNU extention
implementation
__USE_GNU is defined by _GNU_SOURCE and configure explicitly sets this
macro and it does have meaning on musl too, where it may have some level
of GNU compatibility but strerror_r is not one of them. Therefore we
have to check for libc implementation for this to be sure.
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/internal.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/internal.c b/src/internal.c
index ef83b71..fb326fa 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -431,7 +431,7 @@ char *cleanpath(char *path) {
const char *xstrerror(int errnum, char *buf, size_t len) {
#ifdef HAVE_STRERROR_R
-# ifdef __USE_GNU
+# ifdef __GLIBC__
/* Annoying linux specific API contract */
return strerror_r(errnum, buf, len);
# else
--
2.37.3

34
meta-oe/recipes-support/augeas/augeas_1.12.0.bb
View File

@ -1,4 +1,36 @@
require augeas.inc
SUMMARY = "Augeas configuration API"
HOMEPAGE = "http://augeas.net/"
BUGTRACKER = "https://fedorahosted.org/augeas/report/1"
LICENSE = "LGPL-2.1-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff"
SRC_URI = "http://download.augeas.net/${BP}.tar.gz \
file://sepbuildfix.patch \
file://0001-src-internal-Use-__GLIBC__-to-check-for-GNU-extentio.patch \
"
SRC_URI[md5sum] = "74f1c7b8550f4e728486091f6b907175"
SRC_URI[sha256sum] = "321942c9cc32185e2e9cb72d0a70eea106635b50269075aca6714e3ec282cb87"
DEPENDS = "readline libxml2"
inherit autotools pkgconfig
PACKAGES =+ "${PN}-lenses lib${BPN}"
FILES:${PN}-lenses = "${datadir}/augeas/lenses"
FILES:lib${BPN} = "${libdir}/lib*${SOLIBS}"
RDEPENDS:lib${BPN} += "${PN}-lenses"
RRECOMMENDS:lib${BPN} += "${PN}"
LEAD_SONAME = "libaugeas.so"
do_install:append() {
rm -fr ${D}${datadir}/vim
}
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}"
PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
EXTRA_AUTORECONF += "-I ${S}/gnulib/m4"