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/003-no_copy.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/003-no_copy.patch')
| -rw-r--r-- | tools/mklibs/patches/003-no_copy.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/mklibs/patches/003-no_copy.patch b/tools/mklibs/patches/003-no_copy.patch index e0ab2ac88d..75beccf82e 100644 --- a/tools/mklibs/patches/003-no_copy.patch +++ b/tools/mklibs/patches/003-no_copy.patch @@ -1,6 +1,6 @@ --- a/src/mklibs +++ b/src/mklibs -@@ -463,7 +463,7 @@ while 1: +@@ -472,7 +472,7 @@ while 1: passnr = passnr + 1 # Gather all already reduced libraries and treat them as objects as well small_libs = [] @@ -9,7 +9,7 @@ obj = dest_path + "/" + lib small_libs.append(obj) inode = os.stat(obj)[ST_INO] -@@ -579,12 +579,7 @@ while 1: +@@ -588,12 +588,7 @@ while 1: if not so_file: sys.exit("File not found:" + library) pic_file = find_pic(library) @@ -23,7 +23,7 @@ # we have a pic file, recompile debug(DEBUG_SPAM, "extracting from:", pic_file, "so_file:", so_file) soname = extract_soname(so_file) -@@ -627,22 +622,14 @@ while 1: +@@ -636,22 +631,14 @@ while 1: cmd.append(library_depends_gcc_libnames(so_file)) command(target + "gcc", *cmd) @@ -47,4 +47,4 @@ + os.rename(dest_path + "/" + lib + "-so", dest_path + "/" + lib) # Canonicalize library names. - for lib in regexpfilter(os.listdir(dest_path), "(.*so[.\d]*)$"): + for lib in sorted(regexpfilter(os.listdir(dest_path), "(.*so[.\d]*)$")): |