summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Playfair Cal <daniel.playfair.cal@gmail.com>2020-05-30 13:01:52 +1000
committerDaniel Playfair Cal <daniel.playfair.cal@gmail.com>2020-12-19 12:15:21 +1100
commit72fbd6f7442a7e3dbc227068e58d082bbbefa2dc (patch)
treee66209279f4356b1dc11b268471583c3eb17225b
parent7526617ab25d314f646c5ae874197b8846de2a64 (diff)
downloaddconf-72fbd6f7442a7e3dbc227068e58d082bbbefa2dc.tar.gz
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.
-rw-r--r--gsettings/symbol.map2
-rwxr-xr-xtests/abicheck.sh2
2 files changed, 4 insertions, 0 deletions
diff --git a/gsettings/symbol.map b/gsettings/symbol.map
index 43ed5a7..ad1719c 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 49291bd..7d90c17 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" -