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
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>
-rwxr-xr-xamdgpu/amdgpu-symbol-check2
-rw-r--r--amdgpu/meson.build1
-rw-r--r--configure.ac1
-rwxr-xr-xexynos/exynos-symbol-check2
-rw-r--r--exynos/meson.build1
-rwxr-xr-xfreedreno/freedreno-symbol-check2
-rw-r--r--freedreno/meson.build1
-rwxr-xr-xintel/intel-symbol-check2
-rw-r--r--intel/meson.build1
-rwxr-xr-xlibkms/kms-symbol-check2
-rw-r--r--libkms/meson.build1
-rw-r--r--meson.build3
-rw-r--r--nouveau/meson.build1
-rwxr-xr-xnouveau/nouveau-symbol-check2
-rw-r--r--omap/meson.build1
-rwxr-xr-xomap/omap-symbol-check2
-rw-r--r--radeon/meson.build1
-rwxr-xr-xradeon/radeon-symbol-check2
-rw-r--r--tegra/meson.build1
-rwxr-xr-xtegra/tegra-symbol-check2
20 files changed, 22 insertions, 9 deletions
diff --git a/amdgpu/amdgpu-symbol-check b/amdgpu/amdgpu-symbol-check
index 17de0c3b..90b7a1d6 100755
--- a/amdgpu/amdgpu-symbol-check
+++ b/amdgpu/amdgpu-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.am/libdrm_amdgpuinclude_HEADERS 4# A list of the latter should be available Makefile.am/libdrm_amdgpuinclude_HEADERS
5 5
6FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_amdgpu.so} | awk '{print $3}' | while read func; do 6FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_amdgpu.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
diff --git a/amdgpu/meson.build b/amdgpu/meson.build
index 8b045205..518b8504 100644
--- a/amdgpu/meson.build
+++ b/amdgpu/meson.build
@@ -61,5 +61,6 @@ ext_libdrm_amdgpu = declare_dependency(
61test( 61test(
62 'amdgpu-symbol-check', 62 'amdgpu-symbol-check',
63 prog_bash, 63 prog_bash,
64 env : env_test,
64 args : [files('amdgpu-symbol-check'), libdrm_amdgpu] 65 args : [files('amdgpu-symbol-check'), libdrm_amdgpu]
65) 66)
diff --git a/configure.ac b/configure.ac
index 68270004..02644a66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
45# Check for programs 45# Check for programs
46AC_PROG_CC 46AC_PROG_CC
47AC_PROG_CC_C99 47AC_PROG_CC_C99
48AC_PROG_NM
48 49
49if test "x$ac_cv_prog_cc_c99" = xno; then 50if test "x$ac_cv_prog_cc_c99" = xno; then
50 AC_MSG_ERROR([Building libdrm requires C99 enabled compiler]) 51 AC_MSG_ERROR([Building libdrm requires C99 enabled compiler])
diff --git a/exynos/exynos-symbol-check b/exynos/exynos-symbol-check
index 9692caa6..e9f1b04d 100755
--- a/exynos/exynos-symbol-check
+++ b/exynos/exynos-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.am/libdrm_exynos*_HEADERS 4# A list of the latter should be available Makefile.am/libdrm_exynos*_HEADERS
5 5
6FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_exynos.so} | awk '{print $3}'| while read func; do 6FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_exynos.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
diff --git a/exynos/meson.build b/exynos/meson.build
index c96ad4e0..30d36405 100644
--- a/exynos/meson.build
+++ b/exynos/meson.build
@@ -49,5 +49,6 @@ pkg.generate(
49test( 49test(
50 'exynos-symbol-check', 50 'exynos-symbol-check',
51 prog_bash, 51 prog_bash,
52 env : env_test,
52 args : [files('exynos-symbol-check'), libdrm_exynos] 53 args : [files('exynos-symbol-check'), libdrm_exynos]
53) 54)
diff --git a/freedreno/freedreno-symbol-check b/freedreno/freedreno-symbol-check
index 6b81040c..56e3d3ee 100755
--- a/freedreno/freedreno-symbol-check
+++ b/freedreno/freedreno-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_FREEDRENO_H_FILES 4# A list of the latter should be available Makefile.sources/LIBDRM_FREEDRENO_H_FILES
5 5
6FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_freedreno.so} | awk '{print $3}'| while read func; do 6FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_freedreno.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
diff --git a/freedreno/meson.build b/freedreno/meson.build
index de6a413f..741b3b6a 100644
--- a/freedreno/meson.build
+++ b/freedreno/meson.build
@@ -72,5 +72,6 @@ pkg.generate(
72test( 72test(
73 'freedreno-symbol-check', 73 'freedreno-symbol-check',
74 prog_bash, 74 prog_bash,
75 env : env_test,
75 args : [files('freedreno-symbol-check'), libdrm_freedreno] 76 args : [files('freedreno-symbol-check'), libdrm_freedreno]
76) 77)
diff --git a/intel/intel-symbol-check b/intel/intel-symbol-check
index 2aa2d819..4d30a4b1 100755
--- a/intel/intel-symbol-check
+++ b/intel/intel-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_INTEL_H_FILES 4# A list of the latter should be available Makefile.sources/LIBDRM_INTEL_H_FILES
5 5
6FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_intel.so} | awk '{print $3}' | while read func; do 6FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_intel.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
diff --git a/intel/meson.build b/intel/meson.build
index ad877274..aa5a1349 100644
--- a/intel/meson.build
+++ b/intel/meson.build
@@ -101,5 +101,6 @@ test(
101test( 101test(
102 'intel-symbol-check', 102 'intel-symbol-check',
103 prog_bash, 103 prog_bash,
104 env : env_test,
104 args : [files('intel-symbol-check'), libdrm_intel] 105 args : [files('intel-symbol-check'), libdrm_intel]
105) 106)
diff --git a/libkms/kms-symbol-check b/libkms/kms-symbol-check
index 658b2692..a5c2120d 100755
--- a/libkms/kms-symbol-check
+++ b/libkms/kms-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/LIBKMS_H_FILES 4# A list of the latter should be available Makefile.sources/LIBKMS_H_FILES
5 5
6FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libkms.so} | awk '{print $3}'| while read func; do 6FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libkms.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
diff --git a/libkms/meson.build b/libkms/meson.build
index 9eff4313..86d1a4ee 100644
--- a/libkms/meson.build
+++ b/libkms/meson.build
@@ -70,5 +70,6 @@ pkg.generate(
70test( 70test(
71 'kms-symbol-check', 71 'kms-symbol-check',
72 prog_bash, 72 prog_bash,
73 env : env_test,
73 args : [files('kms-symbol-check'), libkms] 74 args : [files('kms-symbol-check'), libkms]
74) 75)
diff --git a/meson.build b/meson.build
index f6b1a432..15a2b084 100644
--- a/meson.build
+++ b/meson.build
@@ -332,6 +332,9 @@ pkg.generate(
332 description : 'Userspace interface to kernel DRM services', 332 description : 'Userspace interface to kernel DRM services',
333) 333)
334 334
335env_test = environment()
336env_test.set('NM', find_program('nm').path())
337
335if with_libkms 338if with_libkms
336 subdir('libkms') 339 subdir('libkms')
337endif 340endif
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
diff --git a/omap/meson.build b/omap/meson.build
index 1881087f..8adb2213 100644
--- a/omap/meson.build
+++ b/omap/meson.build
@@ -49,5 +49,6 @@ pkg.generate(
49test( 49test(
50 'omap-symbol-check', 50 'omap-symbol-check',
51 prog_bash, 51 prog_bash,
52 env : env_test,
52 args : [files('omap-symbol-check'), libdrm_omap] 53 args : [files('omap-symbol-check'), libdrm_omap]
53) 54)
diff --git a/omap/omap-symbol-check b/omap/omap-symbol-check
index 759c84bd..0fb4a0f2 100755
--- a/omap/omap-symbol-check
+++ b/omap/omap-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.am/libdrm_omap*HEADERS 4# A list of the latter should be available Makefile.am/libdrm_omap*HEADERS
5 5
6FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_omap.so} | awk '{print $3}'| while read func; do 6FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_omap.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
diff --git a/radeon/meson.build b/radeon/meson.build
index b02166fe..a4171b41 100644
--- a/radeon/meson.build
+++ b/radeon/meson.build
@@ -59,5 +59,6 @@ pkg.generate(
59test( 59test(
60 'radeon-symbol-check', 60 'radeon-symbol-check',
61 prog_bash, 61 prog_bash,
62 env : env_test,
62 args : [files('radeon-symbol-check'), libdrm_radeon] 63 args : [files('radeon-symbol-check'), libdrm_radeon]
63) 64)
diff --git a/radeon/radeon-symbol-check b/radeon/radeon-symbol-check
index 0bf2ffcb..7d79d901 100755
--- a/radeon/radeon-symbol-check
+++ b/radeon/radeon-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_RADEON_H_FILES 4# A list of the latter should be available Makefile.sources/LIBDRM_RADEON_H_FILES
5 5
6FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_radeon.so} | awk '{print $3}'| while read func; do 6FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_radeon.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
diff --git a/tegra/meson.build b/tegra/meson.build
index 99fdd194..7c671cd5 100644
--- a/tegra/meson.build
+++ b/tegra/meson.build
@@ -48,5 +48,6 @@ pkg.generate(
48test( 48test(
49 'tegra-symbol-check', 49 'tegra-symbol-check',
50 prog_bash, 50 prog_bash,
51 env : env_test,
51 args : [files('tegra-symbol-check'), libdrm_tegra] 52 args : [files('tegra-symbol-check'), libdrm_tegra]
52) 53)
diff --git a/tegra/tegra-symbol-check b/tegra/tegra-symbol-check
index 420469f4..509b678c 100755
--- a/tegra/tegra-symbol-check
+++ b/tegra/tegra-symbol-check
@@ -2,7 +2,7 @@
2 2
3# The following symbols (past the first nine) are taken from tegra.h. 3# The following symbols (past the first nine) are taken from tegra.h.
4 4
5FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_tegra.so} | awk '{print $3}'| while read func; do 5FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_tegra.so} | awk '{print $3}'| while read func; do
6( grep -q "^$func$" || echo $func ) <<EOF 6( grep -q "^$func$" || echo $func ) <<EOF
7__bss_end__ 7__bss_end__
8__bss_start__ 8__bss_start__