diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-10-26 03:30:47 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-10-26 03:30:47 +0000 |
| commit | 6a9ace0cdada3d1c26f54339333eab65532eeaf2 (patch) | |
| tree | a71fcf9e4fb7055e58dcfdc9624484516bf8e5f5 /user/rpm/musl.patch | |
| parent | 1e534ce843da1179cb8d97a1d6e8043825cb8c3c (diff) | |
| parent | de6423ac7185ca1e5b9bd3e8a5682bc523afc197 (diff) | |
| download | packages-6a9ace0cdada3d1c26f54339333eab65532eeaf2.tar.gz packages-6a9ace0cdada3d1c26f54339333eab65532eeaf2.tar.bz2 packages-6a9ace0cdada3d1c26f54339333eab65532eeaf2.tar.xz packages-6a9ace0cdada3d1c26f54339333eab65532eeaf2.zip | |
Merge branch 'rpm' into 'master'
user/rpm: Add
See merge request adelie/packages!513
Diffstat (limited to 'user/rpm/musl.patch')
| -rw-r--r-- | user/rpm/musl.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/user/rpm/musl.patch b/user/rpm/musl.patch new file mode 100644 index 000000000..65f3a10aa --- /dev/null +++ b/user/rpm/musl.patch @@ -0,0 +1,33 @@ +Upstream: No +Reason: Fixes compilation with musl + +--- a/configure.ac ++++ b/configure.ac +@@ -229,6 +229,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).]) +@@ -237,7 +238,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 +--- a/rpmio/digest_nss.c ++++ b/rpmio/digest_nss.c +@@ -6,6 +6,7 @@ + #include <keyhi.h> + #include <cryptohi.h> + #include <blapit.h> ++#include <signal.h> + + #include <rpm/rpmlog.h> + #include "rpmio/digest.h" + |