Skip to contentSkip to conversation

rpm: Fix error.h handing properly on musl

PATCH New Khem Raj 1 participant 1 message Nov 1, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 rpm: Fix error.h handing properly on musl

Ignoring configure fragments when error.h does not exist on system leaves eflutils half configured, which is seen when gold linker is enabled because librpm does not have proper dependencies added, therefore add error.h for non-glibc case and include it when glibc is not used.

---
 .../0001-Fix-build-with-musl-C-library.patch  |  26 ----
 ...tools-Add-error.h-for-non-glibc-case.patch | 118 ++++++++++++++++++
 meta/recipes-devtools/rpm/rpm_4.16.0.bb       |   1 +
 3 files changed, 119 insertions(+), 26 deletions(-)
 create mode 100644 meta/recipes-devtools/rpm/files/0001-tools-Add-error.h-for-non-glibc-case.patch
meta/recipes-devtools/rpm/files/0001-Fix-build-with-musl-C-library.patch +0 -26
index 0b1d6298a9..b960da6c31 100644
@@ -11,29 +11,6 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  rpmio/digest_nss.c | 1 +
  2 files changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/configure.ac b/configure.ac
-index c04a2e8d1..c9d9ac16d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -255,6 +255,7 @@ AC_SEARCH_LIBS(dlopen, [dl])
- # Check for libelf library. Prefer external, otherwise none.
- WITH_LIBELF_LIB=
- AC_CHECK_HEADER([libelf.h])
-+AC_CHECK_HEADERS([error.h], [WITH_ERROR_H=yes])
- AC_CHECK_HEADERS([gelf.h], [
- 	AC_CHECK_LIB(elf, gelf_getvernaux, [
- 	    AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have the 'elf' library (-lelf).])
-@@ -263,7 +264,7 @@ AC_CHECK_HEADERS([gelf.h], [
- 	])
- ])
- AC_SUBST(WITH_LIBELF_LIB)
--AM_CONDITIONAL(LIBELF,[test "$WITH_LIBELF" = yes])
-+AM_CONDITIONAL(LIBELF,[test "$WITH_LIBELF" = yes && test "$WITH_ERROR_H" = yes])
- 
- AC_CHECK_HEADERS([dwarf.h], [
-   WITH_LIBDWARF=yes
-diff --git a/rpmio/digest_nss.c b/rpmio/digest_nss.c
-index 992d9acf6..e11920e3e 100644
 --- a/rpmio/digest_nss.c
 +++ b/rpmio/digest_nss.c
 @@ -1,5 +1,6 @@
@@ -43,6 +20,3 @@ index 992d9acf6..e11920e3e 100644
  #include <pthread.h>
  #include <nss.h>
  #include <sechash.h>
--- 
-2.14.2
-
meta/recipes-devtools/rpm/files/0001-tools-Add-error.h-for-non-glibc-case.patch new file +118 -0

118 lines not on this page · raw message

meta/recipes-devtools/rpm/rpm_4.16.0.bb +1 -0
index f01874fe38..a578cf3cbd 100644
@@ -40,6 +40,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.16.x \
            file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \
            file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \
            file://0001-rpmdb.c-add-a-missing-include.patch \
+           file://0001-tools-Add-error.h-for-non-glibc-case.patch \
            "
 
 PE = "1"
Signature · 1 line
2.29.2