diff options
author | Daniel Golle <daniel@makrotopia.org> | 2019-07-26 23:45:47 +0200 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2019-07-26 23:50:21 +0200 |
commit | 9437012b9ee4dc550e42665b71902cf885169100 (patch) | |
tree | 68243f401099be5e37fddbdf15ae745e267c8cb7 /tools/mklibs/patches/009-uclibc_libpthread_symbols.patch | |
parent | 83d5ca2186f7801d94f336e09f8db0a2c5c5d97f (diff) | |
download | upstream-9437012b9ee4dc550e42665b71902cf885169100.tar.gz upstream-9437012b9ee4dc550e42665b71902cf885169100.tar.bz2 upstream-9437012b9ee4dc550e42665b71902cf885169100.zip |
tools/mklibs: update to 0.1.44 and convert to Python 3
Since the switch to Python 3 build fails if CONFIG_USE_MKLIBS is set
("Strip unnecessary functions from libraries" in menuconfig) as
mklibs hasn't been converted to run on Python 3.
* update to most recent upstream version which brings some
reproducibility fixes
* converted to Python 3 using 2to3
* fixed mixed tab/spaces indentation
* fixed use of string.* functions
* some more minor fixes to make Python 3 happy
Fixes commit 19938c8de7 ("build: switch to Python 3")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'tools/mklibs/patches/009-uclibc_libpthread_symbols.patch')
-rw-r--r-- | tools/mklibs/patches/009-uclibc_libpthread_symbols.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/mklibs/patches/009-uclibc_libpthread_symbols.patch b/tools/mklibs/patches/009-uclibc_libpthread_symbols.patch index 34866f7290..0d4d3e95aa 100644 --- a/tools/mklibs/patches/009-uclibc_libpthread_symbols.patch +++ b/tools/mklibs/patches/009-uclibc_libpthread_symbols.patch @@ -1,6 +1,6 @@ --- a/src/mklibs +++ b/src/mklibs -@@ -162,9 +162,10 @@ def undefined_symbols(obj): +@@ -173,9 +173,10 @@ def undefined_symbols(obj): return result class ProvidedSymbol(Symbol): @@ -12,7 +12,7 @@ def base_names(self): ret = [] -@@ -205,11 +206,15 @@ def provided_symbols(obj): +@@ -216,11 +217,15 @@ def provided_symbols(obj): if version_string.lower() not in ('base', 'none'): version = version_string @@ -29,7 +29,7 @@ return result -@@ -500,6 +505,9 @@ while 1: +@@ -509,6 +514,9 @@ while 1: debug(DEBUG_SPAM, "present_symbols adding %s" % symbol) names = symbol.base_names() for name in names: @@ -39,7 +39,7 @@ present_symbols[name] = symbol # are we finished? -@@ -591,12 +599,16 @@ while 1: +@@ -600,12 +608,16 @@ while 1: # may segfault in ptmalloc_init due to undefined weak reference extra_pre_obj.append(sysroot + libc_extras_dir + "/soinit.o") extra_post_obj.append(sysroot + libc_extras_dir + "/sofini.o") |