aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Becker2018-02-19 09:13:15 -0600
committerEric Engestrom2018-02-23 11:53:08 -0600
commit4f08bfe96da1542f336589edf310d06ebce3cf20 (patch)
tree189d03ab810f7fba8993fcbab638cddae5f2bf3b /nouveau
parent009634e493097afae95d190fc26cb04a1664648a (diff)
downloadexternal-libgbm-4f08bfe96da1542f336589edf310d06ebce3cf20.tar.gz
external-libgbm-4f08bfe96da1542f336589edf310d06ebce3cf20.tar.xz
external-libgbm-4f08bfe96da1542f336589edf310d06ebce3cf20.zip
*-symbol-check: Don't hard-code nm executable
Helpful if your nm executable has a prefix based on the architecture, for example. Signed-off-by: Heiko Becker <heirecka@exherbo.org> Cc: Timo Gurr <timo.gurr@gmail.com> [Eric: v2: rebase and add Meson support] Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'nouveau')
-rw-r--r--nouveau/meson.build1
-rwxr-xr-xnouveau/nouveau-symbol-check2
2 files changed, 2 insertions, 1 deletions
diff --git a/nouveau/meson.build b/nouveau/meson.build
index f031cd63..80a8678c 100644
--- a/nouveau/meson.build
+++ b/nouveau/meson.build
@@ -54,5 +54,6 @@ pkg.generate(
54test( 54test(
55 'nouveau-symbol-check', 55 'nouveau-symbol-check',
56 prog_bash, 56 prog_bash,
57 env : env_test,
57 args : [files('nouveau-symbol-check'), libdrm_nouveau] 58 args : [files('nouveau-symbol-check'), libdrm_nouveau]
58) 59)
diff --git a/nouveau/nouveau-symbol-check b/nouveau/nouveau-symbol-check
index b265cea4..b3a24101 100755
--- a/nouveau/nouveau-symbol-check
+++ b/nouveau/nouveau-symbol-check
@@ -3,7 +3,7 @@
3# The following symbols (past the first five) are taken from the public headers. 3# The following symbols (past the first five) are taken from the public headers.
4# A list of the latter should be available Makefile.sources/LIBDRM_NOUVEAU_H_FILES 4# A list of the latter should be available Makefile.sources/LIBDRM_NOUVEAU_H_FILES
5 5
6FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_nouveau.so} | awk '{print $3}'| while read func; do 6FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_nouveau.so} | awk '{print $3}'| while read func; do
7( grep -q "^$func$" || echo $func ) <<EOF 7( grep -q "^$func$" || echo $func ) <<EOF
8__bss_start 8__bss_start
9_edata 9_edata