colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: allow configuring path to binutils's nm tool during build

Browse Source 
`nm` is used by "tools/create-exports-NetworkManager.sh" script.
Alloc configuring an explicit path during configure.

  BINUTILS_NM=/usr/bin/nm ./configure
This commit is contained in:
Thomas Haller
2017-02-08 16:18:11 +01:00
parent a347962831
commit 8bc88bcc7c
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@@ -1478,7 +1478,7 @@ src_libNetworkManagerTest_la_LIBADD = \
############################################################################### ###############################################################################
src/NetworkManager.ver: src/libNetworkManager.la $(core_plugins) src/NetworkManager.ver: src/libNetworkManager.la $(core_plugins)
$(AM_V_GEN) "$(srcdir)/tools/create-exports-NetworkManager.sh" --called-from-make "$(srcdir)" $(AM_V_GEN) BINUTILS_NM="$(BINUTILS_NM)" "$(srcdir)/tools/create-exports-NetworkManager.sh" --called-from-make "$(srcdir)"
CLEANFILES += src/NetworkManager.ver CLEANFILES += src/NetworkManager.ver

2
configure.ac
View File

@@ -1121,6 +1121,8 @@ AM_PATH_PYTHON([], [], [PYTHON=python])
AC_SUBST(PYTHON, [$PYTHON]) AC_SUBST(PYTHON, [$PYTHON])
AC_DEFINE_UNQUOTED(TEST_NM_PYTHON, "$PYTHON", [Define python path for test binary]) AC_DEFINE_UNQUOTED(TEST_NM_PYTHON, "$PYTHON", [Define python path for test binary])
AC_PATH_TOOL(BINUTILS_NM, nm, nm)
# check if we can build setting property documentation # check if we can build setting property documentation
build_setting_docs=no build_setting_docs=no
if test -n "$INTROSPECTION_MAKEFILE"; then if test -n "$INTROSPECTION_MAKEFILE"; then

2
tools/create-exports-NetworkManager.sh
View File

@@ -29,7 +29,7 @@ _sort() {
} }
call_nm() { call_nm() {
nm "$1" | "${BINUTILS_NM:-${NM:-nm}}" "$1" |
sed -n 's/.* \([^ ]\) \([^ ]*\)$/\1 \2/p' sed -n 's/.* \([^ ]\) \([^ ]*\)$/\1 \2/p'
} }