system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-21 18:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: support meson builds in create-exports script

Browse source 
(cherry picked from commit 9b4bc0824c)
This commit is contained in:
Beniamino Galvani 2018-09-11 13:48:40 +02:00
parent fb0d36a883
commit 10ca2444b9
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -1850,7 +1850,7 @@ $(src_libNetworkManagerTest_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
###############################################################################
src/NetworkManager.ver: src/libNetworkManager.la $(core_plugins)
$(AM_V_GEN) NM="$(NM)" "$(srcdir)/tools/create-exports-NetworkManager.sh" --called-from-make "$(srcdir)"
$(AM_V_GEN) NM="$(NM)" "$(srcdir)/tools/create-exports-NetworkManager.sh" --called-from-build "$(srcdir)"
CLEANFILES += src/NetworkManager.ver

21
tools/create-exports-NetworkManager.sh
View file

@ -35,7 +35,7 @@ call_nm() {
}
get_symbols_nm () {
call_nm ./src/.libs/libNetworkManager.a |
call_nm ./src/${libs}libNetworkManager.a |
sed -n 's/^[tTDGRBS] //p' |
_sort
}
@ -47,9 +47,9 @@ EOF
}
get_symbols_missing() {
(for f in $(find ./src/settings/plugins/*/.libs/ \
./src/devices/*/.libs/ \
./src/ppp/.libs/ -name '*.so'); do
(for f in $(find ./src/settings/plugins/*/${libs} \
./src/devices/*/${libs} \
./src/ppp/${libs} -name '*.so'); do
call_nm "$f" |
sed -n 's/^\([U]\) \(\(nm_\|nmp_\|_nm\|NM\|_NM\|c_siphash_\).*\)$/\2/p'
done) |
@ -90,16 +90,25 @@ local:
EOF
}
test -f ./src/.libs/libNetworkManager.a || die "must be called from NetworkManager \$(top_builddir) after building the tree"
if [ -f "build.ninja" ]; then
from_meson=1
libs=
else
libs=.libs/
fi
test -f ./src/${libs}libNetworkManager.a || die "must be called from NetworkManager top build dir after building the tree"
case "$1" in
rebuild)
[ -n "$from_meson" ] && die "can't do a build when called from meson"
do_rebuild
;;
build)
[ -n "$from_meson" ] && die "can't do a build when called from meson"
do_build
;;
'--called-from-make')
--called-from-build)
if test -z "${NM_BUILD_NO_CREATE_EXPORTS+x}"; then
do_update
else