[oe-commits] [openembedded-core] branch pyro updated: Revert "expat: Don't use getrandom() in the -native case"

git at git.openembedded.org git at git.openembedded.org
Mon Sep 11 22:52:20 UTC 2017


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch pyro
in repository openembedded-core.

The following commit(s) were added to refs/heads/pyro by this push:
     new 7b3584a  Revert "expat: Don't use getrandom() in the -native case"
7b3584a is described below

commit 7b3584ace93d45ac4078019a7ef185c6e190c51f
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Mon Sep 11 23:50:55 2017 +0100

    Revert "expat: Don't use getrandom() in the -native case"
    
    This reverts commit 450942db7f4638eba7ec262901fe1d7e1b1f6070.
    
    Applied in error to the pyro branch.
---
 meta/recipes-core/expat/expat.inc                |  3 ---
 meta/recipes-core/expat/expat/no_getrandom.patch | 23 -----------------------
 2 files changed, 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"
 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 d64f1bf..0000000
--- 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],

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list