summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-11 22:50:55 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-11 22:51:59 (GMT)
commitce26a57e04ad65c02087629701d96448a44e73d5 (patch)
tree47f6d1f3269477e1b253adef270812283615f342
parentc60135eeef4f78c1e32a3ca2ea6e16a01005b860 (diff)
downloadpoky-yocto-2.3.2.tar.gz
Revert "expat: Don't use getrandom() in the -native case"yocto-2.3.2pyro-17.0.2
This reverts commit 450942db7f4638eba7ec262901fe1d7e1b1f6070. Applied in error to the pyro branch. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/expat/expat.inc3
-rw-r--r--meta/recipes-core/expat/expat/no_getrandom.patch23
2 files changed, 0 insertions, 26 deletions
diff --git a/meta/recipes-core/expat/expat.inc b/meta/recipes-core/expat/expat.inc
index 8bfd0bf..9fa0ca2 100644
--- a/meta/recipes-core/expat/expat.inc
+++ b/meta/recipes-core/expat/expat.inc
@@ -7,9 +7,6 @@ LICENSE = "MIT"
7SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ 7SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \
8 file://autotools.patch \ 8 file://autotools.patch \
9 " 9 "
10
11SRC_URI_append_class-native = " file://no_getrandom.patch"
12
13inherit autotools lib_package 10inherit autotools lib_package
14 11
15# This package uses an archive format known to have issue with some 12# 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 d64f1bf..0000000
--- a/meta/recipes-core/expat/expat/no_getrandom.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1The native version of expat may be used on older systems which dont have glibc 2.25
2and hence don't have getrandom() thanks to uninative. Disable the libc call and
3use the syscall instead to avoid a compatibility issue until we have 2.25 everywhere
4we support with uninative.
5
6RP
72017/8/14
8
9Upstream-Status: Inappropriate
10
11Index: expat-2.2.3/configure.ac
12===================================================================
13--- expat-2.2.3.orig/configure.ac
14+++ expat-2.2.3/configure.ac
15@@ -151,7 +151,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
16 #include <stdlib.h> /* for NULL */
17 #include <sys/random.h>
18 int main() {
19- return getrandom(NULL, 0U, 0U);
20+ return getrandomBREAKME(NULL, 0U, 0U);
21 }
22 ])], [
23 AC_DEFINE([HAVE_GETRANDOM], [1],