diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/files/0001-Fix-build-with-musl-C-library.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/files/0001-Fix-build-with-musl-C-library.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-build-with-musl-C-library.patch b/meta/recipes-devtools/rpm/files/0001-Fix-build-with-musl-C-library.patch index 0b1d6298a9..b960da6c31 100644 --- a/meta/recipes-devtools/rpm/files/0001-Fix-build-with-musl-C-library.patch +++ b/meta/recipes-devtools/rpm/files/0001-Fix-build-with-musl-C-library.patch | |||
@@ -11,29 +11,6 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
11 | rpmio/digest_nss.c | 1 + | 11 | rpmio/digest_nss.c | 1 + |
12 | 2 files changed, 3 insertions(+), 1 deletion(-) | 12 | 2 files changed, 3 insertions(+), 1 deletion(-) |
13 | 13 | ||
14 | diff --git a/configure.ac b/configure.ac | ||
15 | index c04a2e8d1..c9d9ac16d 100644 | ||
16 | --- a/configure.ac | ||
17 | +++ b/configure.ac | ||
18 | @@ -255,6 +255,7 @@ AC_SEARCH_LIBS(dlopen, [dl]) | ||
19 | # Check for libelf library. Prefer external, otherwise none. | ||
20 | WITH_LIBELF_LIB= | ||
21 | AC_CHECK_HEADER([libelf.h]) | ||
22 | +AC_CHECK_HEADERS([error.h], [WITH_ERROR_H=yes]) | ||
23 | AC_CHECK_HEADERS([gelf.h], [ | ||
24 | AC_CHECK_LIB(elf, gelf_getvernaux, [ | ||
25 | AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have the 'elf' library (-lelf).]) | ||
26 | @@ -263,7 +264,7 @@ AC_CHECK_HEADERS([gelf.h], [ | ||
27 | ]) | ||
28 | ]) | ||
29 | AC_SUBST(WITH_LIBELF_LIB) | ||
30 | -AM_CONDITIONAL(LIBELF,[test "$WITH_LIBELF" = yes]) | ||
31 | +AM_CONDITIONAL(LIBELF,[test "$WITH_LIBELF" = yes && test "$WITH_ERROR_H" = yes]) | ||
32 | |||
33 | AC_CHECK_HEADERS([dwarf.h], [ | ||
34 | WITH_LIBDWARF=yes | ||
35 | diff --git a/rpmio/digest_nss.c b/rpmio/digest_nss.c | ||
36 | index 992d9acf6..e11920e3e 100644 | ||
37 | --- a/rpmio/digest_nss.c | 14 | --- a/rpmio/digest_nss.c |
38 | +++ b/rpmio/digest_nss.c | 15 | +++ b/rpmio/digest_nss.c |
39 | @@ -1,5 +1,6 @@ | 16 | @@ -1,5 +1,6 @@ |
@@ -43,6 +20,3 @@ index 992d9acf6..e11920e3e 100644 | |||
43 | #include <pthread.h> | 20 | #include <pthread.h> |
44 | #include <nss.h> | 21 | #include <nss.h> |
45 | #include <sechash.h> | 22 | #include <sechash.h> |
46 | -- | ||
47 | 2.14.2 | ||
48 | |||