summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/uninative.bbclass4
-rw-r--r--meta/recipes-core/expat/expat/no_getrandom.patch23
-rw-r--r--meta/recipes-core/expat/expat_2.2.5.bb2
-rw-r--r--meta/recipes-core/util-linux/util-linux/no_getrandom.patch21
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.31.bb1
-rw-r--r--meta/recipes-devtools/python/python3-native_3.5.5.bb3
6 files changed, 4 insertions, 50 deletions
diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass
index 0501ddec40..23c5314818 100644
--- a/meta/classes/uninative.bbclass
+++ b/meta/classes/uninative.bbclass
@@ -9,7 +9,7 @@ UNINATIVE_TARBALL ?= "${BUILD_ARCH}-nativesdk-libc.tar.bz2"
9UNINATIVE_DLDIR ?= "${DL_DIR}/uninative/" 9UNINATIVE_DLDIR ?= "${DL_DIR}/uninative/"
10 10
11# Enabling uninative will change the following variables so they need to go the parsing white list to prevent multiple recipe parsing 11# Enabling uninative will change the following variables so they need to go the parsing white list to prevent multiple recipe parsing
12BB_HASHCONFIG_WHITELIST += "NATIVELSBSTRING SSTATEPOSTUNPACKFUNCS" 12BB_HASHCONFIG_WHITELIST += "NATIVELSBSTRING SSTATEPOSTUNPACKFUNCS BUILD_LDFLAGS"
13 13
14addhandler uninative_event_fetchloader 14addhandler uninative_event_fetchloader
15uninative_event_fetchloader[eventmask] = "bb.event.BuildStarted" 15uninative_event_fetchloader[eventmask] = "bb.event.BuildStarted"
@@ -129,6 +129,8 @@ def enable_uninative(d):
129 d.setVar("NATIVELSBSTRING", "universal%s" % oe.utils.host_gcc_version(d)) 129 d.setVar("NATIVELSBSTRING", "universal%s" % oe.utils.host_gcc_version(d))
130 d.appendVar("SSTATEPOSTUNPACKFUNCS", " uninative_changeinterp") 130 d.appendVar("SSTATEPOSTUNPACKFUNCS", " uninative_changeinterp")
131 d.appendVarFlag("SSTATEPOSTUNPACKFUNCS", "vardepvalueexclude", "| uninative_changeinterp") 131 d.appendVarFlag("SSTATEPOSTUNPACKFUNCS", "vardepvalueexclude", "| uninative_changeinterp")
132 d.appendVar("BUILD_LDFLAGS", " -Wl,--allow-shlib-undefined")
133 d.appendVarFlag("BUILD_LDFLAGS", "vardepvalueexclude", "| -Wl,--allow-shlib-undefined")
132 d.prependVar("PATH", "${STAGING_DIR}-uninative/${BUILD_ARCH}-linux${bindir_native}:") 134 d.prependVar("PATH", "${STAGING_DIR}-uninative/${BUILD_ARCH}-linux${bindir_native}:")
133 135
134python uninative_changeinterp () { 136python uninative_changeinterp () {
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 @@
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],
diff --git a/meta/recipes-core/expat/expat_2.2.5.bb b/meta/recipes-core/expat/expat_2.2.5.bb
index bce59298e5..c68a2ef367 100644
--- a/meta/recipes-core/expat/expat_2.2.5.bb
+++ b/meta/recipes-core/expat/expat_2.2.5.bb
@@ -11,8 +11,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \
11 file://libtool-tag.patch \ 11 file://libtool-tag.patch \
12 " 12 "
13 13
14SRC_URI_append_class-native = " file://no_getrandom.patch"
15
16SRC_URI[md5sum] = "789e297f547980fc9ecc036f9a070d49" 14SRC_URI[md5sum] = "789e297f547980fc9ecc036f9a070d49"
17SRC_URI[sha256sum] = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6" 15SRC_URI[sha256sum] = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6"
18 16
diff --git a/meta/recipes-core/util-linux/util-linux/no_getrandom.patch b/meta/recipes-core/util-linux/util-linux/no_getrandom.patch
deleted file mode 100644
index b9fa1cace4..0000000000
--- a/meta/recipes-core/util-linux/util-linux/no_getrandom.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1getrandom() is only available in glibc 2.25+ and uninative may relocate
2binaries onto systems that don't have this function. For now, force the
3code to the older codepath until we can come up with a better solution
4for this kind of issue.
5
6Upstream-Status: Inappropriate
7RP
82016/8/15
9
10Index: util-linux-2.30/configure.ac
11===================================================================
12--- util-linux-2.30.orig/configure.ac
13+++ util-linux-2.30/configure.ac
14@@ -399,7 +399,6 @@ AC_CHECK_FUNCS([ \
15 getdtablesize \
16 getexecname \
17 getmntinfo \
18- getrandom \
19 getrlimit \
20 getsgnam \
21 inotify_init \
diff --git a/meta/recipes-core/util-linux/util-linux_2.31.bb b/meta/recipes-core/util-linux/util-linux_2.31.bb
index a83919b5ac..7f7a78ef60 100644
--- a/meta/recipes-core/util-linux/util-linux_2.31.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.31.bb
@@ -15,7 +15,6 @@ SRC_URI += "file://configure-sbindir.patch \
15 file://display_testname_for_subtest.patch \ 15 file://display_testname_for_subtest.patch \
16 file://avoid_parallel_tests.patch \ 16 file://avoid_parallel_tests.patch \
17" 17"
18SRC_URI_append_class-native = " file://no_getrandom.patch"
19SRC_URI[md5sum] = "5b6821c403c3cc6e7775f74df1882a20" 18SRC_URI[md5sum] = "5b6821c403c3cc6e7775f74df1882a20"
20SRC_URI[sha256sum] = "f9be7cdcf4fc5c5064a226599acdda6bdf3d86c640152ba01ea642d91108dc8a" 19SRC_URI[sha256sum] = "f9be7cdcf4fc5c5064a226599acdda6bdf3d86c640152ba01ea642d91108dc8a"
21 20
diff --git a/meta/recipes-devtools/python/python3-native_3.5.5.bb b/meta/recipes-devtools/python/python3-native_3.5.5.bb
index 70c1512b5b..962ccfcc4c 100644
--- a/meta/recipes-devtools/python/python3-native_3.5.5.bb
+++ b/meta/recipes-devtools/python/python3-native_3.5.5.bb
@@ -42,8 +42,7 @@ DEPENDS = "openssl-native bzip2-replacement-native zlib-native readline-native s
42 42
43inherit native 43inherit native
44 44
45# uninative may be used on pre glibc 2.25 systems which don't have getentropy 45EXTRA_OECONF_append = " --bindir=${bindir}/${PN} --without-ensurepip"
46EXTRA_OECONF_append = " --bindir=${bindir}/${PN} --without-ensurepip ac_cv_func_getentropy=no"
47 46
48EXTRA_OEMAKE = '\ 47EXTRA_OEMAKE = '\
49 LIBC="" \ 48 LIBC="" \