[dconf: 5/6] include symbols needed by GNU BFD ld in map




commit 72fbd6f7442a7e3dbc227068e58d082bbbefa2dc
Author: Daniel Playfair Cal <daniel playfair cal gmail com>
Date:   Sat May 30 13:01:52 2020 +1000

    include symbols needed by GNU BFD ld in map
    
    On FreeBSD using the default GNU BFD linker, the use of --version-script
    fails unless the symbols `__progname` and `environ` are included. This
    change includes them in the symbol map, which should allow the build to
    succeed on FreeBSD.

 gsettings/symbol.map | 2 ++
 tests/abicheck.sh    | 2 ++
 2 files changed, 4 insertions(+)
---
diff --git a/gsettings/symbol.map b/gsettings/symbol.map
index 43ed5a77..ad1719c9 100644
--- a/gsettings/symbol.map
+++ b/gsettings/symbol.map
@@ -3,6 +3,8 @@ global:
   g_io_module_load;
   g_io_module_unload;
   g_io_module_query;
+  environ;
+  __progname;
 local:
   *;
 };
diff --git a/tests/abicheck.sh b/tests/abicheck.sh
index 49291bdd..7d90c179 100755
--- a/tests/abicheck.sh
+++ b/tests/abicheck.sh
@@ -29,5 +29,7 @@ SYMBOL_FILE="$2"
 ${NM:-nm} --dynamic --defined-only "$BINARY" | \
     cut -f 3 -d ' ' | \
     grep -v ^_ | \
+    grep -v ^environ | \
+    grep -v __progname | \
     grep -v ^mangle_path | \
     diff "$SYMBOL_FILE" -


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]