]> code.ossystems Code Review - openembedded-core.git/commitdiff
Revert "expat: Don't use getrandom() in the -native case"
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 11 Sep 2017 22:50:55 +0000 (23:50 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 11 Sep 2017 22:50:55 +0000 (23:50 +0100)
This reverts commit 450942db7f4638eba7ec262901fe1d7e1b1f6070.

Applied in error to the pyro branch.

meta/recipes-core/expat/expat.inc
meta/recipes-core/expat/expat/no_getrandom.patch [deleted file]

index 8bfd0bf26ca3159b5b0c3b55af37c130bb704f46..9fa0ca2eb33b89a9846d21f43ab41b2565a2516b 100644 (file)
@@ -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 (file)
index d64f1bf..0000000
+++ /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],