42 lines
1.4 KiB
Text
42 lines
1.4 KiB
Text
Drop fully fledged version script support, only use simpler version
|
|
scripts to limit symbol visibility. Appending a version to all symbols
|
|
breaks binutils-2.17 ld(1).
|
|
|
|
Index: buildtools/wafsamba/samba_abi.py
|
|
--- buildtools/wafsamba/samba_abi.py.orig
|
|
+++ buildtools/wafsamba/samba_abi.py
|
|
@@ -170,7 +170,7 @@ def version_script_map_process_file(fname, version, ab
|
|
continue
|
|
if line.startswith("#"):
|
|
continue
|
|
- if line.endswith(" {"):
|
|
+ if line.endswith("{"):
|
|
in_section = True
|
|
continue
|
|
if line == "};":
|
|
@@ -211,24 +211,7 @@ def abi_write_vscript(f, libname, current_version, ver
|
|
version
|
|
"""
|
|
|
|
- invmap = {}
|
|
- for s in symmap:
|
|
- invmap.setdefault(symmap[s], []).append(s)
|
|
-
|
|
- last_key = ""
|
|
- versions = sorted(versions, key=version_key)
|
|
- for k in versions:
|
|
- symver = "%s_%s" % (libname, k)
|
|
- if symver == current_version:
|
|
- break
|
|
- f.write("%s {\n" % symver)
|
|
- if k in sorted(invmap.keys()):
|
|
- f.write("\tglobal:\n")
|
|
- for s in invmap.get(k, []):
|
|
- f.write("\t\t%s;\n" % s);
|
|
- f.write("}%s;\n\n" % last_key)
|
|
- last_key = " %s" % symver
|
|
- f.write("%s {\n" % current_version)
|
|
+ f.write("{\n")
|
|
local_abi = list(filter(lambda x: x[0] == '!', abi_match))
|
|
global_abi = list(filter(lambda x: x[0] != '!', abi_match))
|
|
f.write("\tglobal:\n")
|