From ce26a57e04ad65c02087629701d96448a44e73d5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 11 Sep 2017 23:50:55 +0100 Subject: Revert "expat: Don't use getrandom() in the -native case" This reverts commit 450942db7f4638eba7ec262901fe1d7e1b1f6070. Applied in error to the pyro branch. Signed-off-by: Richard Purdie --- meta/recipes-core/expat/expat.inc | 3 --- meta/recipes-core/expat/expat/no_getrandom.patch | 23 ----------------------- 2 files changed, 26 deletions(-) delete mode 100644 meta/recipes-core/expat/expat/no_getrandom.patch diff --git a/meta/recipes-core/expat/expat.inc b/meta/recipes-core/expat/expat.inc index 8bfd0bf26c..9fa0ca2eb3 100644 --- a/meta/recipes-core/expat/expat.inc +++ b/meta/recipes-core/expat/expat.inc @@ -7,9 +7,6 @@ LICENSE = "MIT" SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ file://autotools.patch \ " - -SRC_URI_append_class-native = " file://no_getrandom.patch" - inherit autotools lib_package # This package uses an archive format known to have issue with some diff --git a/meta/recipes-core/expat/expat/no_getrandom.patch b/meta/recipes-core/expat/expat/no_getrandom.patch deleted file mode 100644 index d64f1bf113..0000000000 --- a/meta/recipes-core/expat/expat/no_getrandom.patch +++ /dev/null @@ -1,23 +0,0 @@ -The native version of expat may be used on older systems which dont have glibc 2.25 -and hence don't have getrandom() thanks to uninative. Disable the libc call and -use the syscall instead to avoid a compatibility issue until we have 2.25 everywhere -we support with uninative. - -RP -2017/8/14 - -Upstream-Status: Inappropriate - -Index: expat-2.2.3/configure.ac -=================================================================== ---- expat-2.2.3.orig/configure.ac -+++ expat-2.2.3/configure.ac -@@ -151,7 +151,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include /* for NULL */ - #include - int main() { -- return getrandom(NULL, 0U, 0U); -+ return getrandomBREAKME(NULL, 0U, 0U); - } - ])], [ - AC_DEFINE([HAVE_GETRANDOM], [1], -- cgit v1.2.3-54-g00ecf