diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-11 23:50:55 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-11 23:50:55 +0100 |
commit | 7b3584ace93d45ac4078019a7ef185c6e190c51f (patch) | |
tree | a4df341d9c34fb1f4293c7bbc0142f5a04eadd68 | |
parent | 347976bf08158d1aa46dfea6f0f9d6dcc0d97395 (diff) | |
download | openembedded-core-contrib-7b3584ace93d45ac4078019a7ef185c6e190c51f.tar.gz |
Revert "expat: Don't use getrandom() in the -native case"
This reverts commit 450942db7f4638eba7ec262901fe1d7e1b1f6070.
Applied in error to the pyro branch.
-rw-r--r-- | meta/recipes-core/expat/expat.inc | 3 | ||||
-rw-r--r-- | meta/recipes-core/expat/expat/no_getrandom.patch | 23 |
2 files changed, 0 insertions, 26 deletions
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 <stdlib.h> /* for NULL */ - #include <sys/random.h> - int main() { -- return getrandom(NULL, 0U, 0U); -+ return getrandomBREAKME(NULL, 0U, 0U); - } - ])], [ - AC_DEFINE([HAVE_GETRANDOM], [1], |