diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/uninative.bbclass | 4 | ||||
-rw-r--r-- | meta/recipes-core/expat/expat.inc | 3 | ||||
-rw-r--r-- | meta/recipes-core/expat/expat/no_getrandom.patch | 23 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/no_getrandom.patch | 21 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.30.bb | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-native_3.5.3.bb | 2 |
6 files changed, 6 insertions, 48 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" | |||
9 | UNINATIVE_DLDIR ?= "${DL_DIR}/uninative/" | 9 | UNINATIVE_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 |
12 | BB_HASHCONFIG_WHITELIST += "NATIVELSBSTRING SSTATEPOSTUNPACKFUNCS" | 12 | BB_HASHCONFIG_WHITELIST += "NATIVELSBSTRING SSTATEPOSTUNPACKFUNCS BUILD_LDFLAGS" |
13 | 13 | ||
14 | addhandler uninative_event_fetchloader | 14 | addhandler uninative_event_fetchloader |
15 | uninative_event_fetchloader[eventmask] = "bb.event.BuildStarted" | 15 | uninative_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 | ||
134 | python uninative_changeinterp () { | 136 | python uninative_changeinterp () { |
diff --git a/meta/recipes-core/expat/expat.inc b/meta/recipes-core/expat/expat.inc index 0ee6c276d9..b815f736ff 100644 --- a/meta/recipes-core/expat/expat.inc +++ b/meta/recipes-core/expat/expat.inc | |||
@@ -9,7 +9,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ | |||
9 | file://libtool-tag.patch \ | 9 | file://libtool-tag.patch \ |
10 | " | 10 | " |
11 | 11 | ||
12 | SRC_URI_append_class-native = " file://no_getrandom.patch" | 12 | SRC_URI[md5sum] = "789e297f547980fc9ecc036f9a070d49" |
13 | SRC_URI[sha256sum] = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6" | ||
13 | 14 | ||
14 | inherit autotools lib_package | 15 | inherit autotools lib_package |
15 | 16 | ||
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 @@ | |||
1 | The native version of expat may be used on older systems which dont have glibc 2.25 | ||
2 | and hence don't have getrandom() thanks to uninative. Disable the libc call and | ||
3 | use the syscall instead to avoid a compatibility issue until we have 2.25 everywhere | ||
4 | we support with uninative. | ||
5 | |||
6 | RP | ||
7 | 2017/8/14 | ||
8 | |||
9 | Upstream-Status: Inappropriate | ||
10 | |||
11 | Index: 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/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 @@ | |||
1 | getrandom() is only available in glibc 2.25+ and uninative may relocate | ||
2 | binaries onto systems that don't have this function. For now, force the | ||
3 | code to the older codepath until we can come up with a better solution | ||
4 | for this kind of issue. | ||
5 | |||
6 | Upstream-Status: Inappropriate | ||
7 | RP | ||
8 | 2016/8/15 | ||
9 | |||
10 | Index: 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.30.bb b/meta/recipes-core/util-linux/util-linux_2.30.bb index 39449d9ac9..6b309b555f 100644 --- a/meta/recipes-core/util-linux/util-linux_2.30.bb +++ b/meta/recipes-core/util-linux/util-linux_2.30.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 | " |
18 | SRC_URI_append_class-native = " file://no_getrandom.patch" | ||
19 | SRC_URI[md5sum] = "eaa3429150268027908a1b8ae6ee9a62" | 18 | SRC_URI[md5sum] = "eaa3429150268027908a1b8ae6ee9a62" |
20 | SRC_URI[sha256sum] = "c208a4ff6906cb7f57940aa5bc3a6eed146e50a7cc0a092f52ef2ab65057a08d" | 19 | SRC_URI[sha256sum] = "c208a4ff6906cb7f57940aa5bc3a6eed146e50a7cc0a092f52ef2ab65057a08d" |
21 | 20 | ||
diff --git a/meta/recipes-devtools/python/python3-native_3.5.3.bb b/meta/recipes-devtools/python/python3-native_3.5.3.bb index 8cd9c88a82..1da87ca4e4 100644 --- a/meta/recipes-devtools/python/python3-native_3.5.3.bb +++ b/meta/recipes-devtools/python/python3-native_3.5.3.bb | |||
@@ -45,7 +45,7 @@ inherit native | |||
45 | require python-native-${PYTHON_MAJMIN}-manifest.inc | 45 | require python-native-${PYTHON_MAJMIN}-manifest.inc |
46 | 46 | ||
47 | # uninative may be used on pre glibc 2.25 systems which don't have getentropy | 47 | # uninative may be used on pre glibc 2.25 systems which don't have getentropy |
48 | EXTRA_OECONF_append = " --bindir=${bindir}/${PN} --without-ensurepip ac_cv_func_getentropy=no" | 48 | EXTRA_OECONF_append = " --bindir=${bindir}/${PN} --without-ensurepip" |
49 | 49 | ||
50 | EXTRA_OEMAKE = '\ | 50 | EXTRA_OEMAKE = '\ |
51 | LIBC="" \ | 51 | LIBC="" \ |