Attachment 137439 Details for Bug 105163 – libdrm-symbol-check-Don-t-hard-code-nm-executable.patch

[patch] libdrm-symbol-check-Don-t-hard-code-nm-executable.patch

libdrm-symbol-check-Don-t-hard-code-nm-executable.patch (text/plain), 6.76 KB, created by Timo Gurr on 2018-02-19 14:34:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Timo Gurr

Created: 2018-02-19 14:34:43 UTC

Size: 6.76 KB

patch

obsolete

>Upstream: sent to mailing list,
>https://lists.freedesktop.org/archives/dri-devel/2016-October/119999.html
>
>From 934556c281926a0f91063196a92312aff670d49a Mon Sep 17 00:00:00 2001
>From: Heiko Becker <heirecka@exherbo.org>
>Date: Mon, 3 Oct 2016 16:53:02 +0200
>Subject: [PATCH] *-symbol-check: Don't hard-code nm executable
>
>Helpful if your nm executable has a prefix based on the
>architecture, for example.
>---
> amdgpu/amdgpu-symbol-check       | 2 +-
> configure.ac                     | 1 +
> exynos/exynos-symbol-check       | 2 +-
> freedreno/freedreno-symbol-check | 2 +-
> intel/intel-symbol-check         | 2 +-
> libkms/kms-symbol-check          | 2 +-
> nouveau/nouveau-symbol-check     | 2 +-
> omap/omap-symbol-check           | 2 +-
> radeon/radeon-symbol-check       | 2 +-
> tegra/tegra-symbol-check         | 2 +-
> 11 files changed, 11 insertions(+), 10 deletions(-)
>
>diff --git a/amdgpu/amdgpu-symbol-check b/amdgpu/amdgpu-symbol-check
>index 648db9b..7e6d5f9 100755
>--- a/amdgpu/amdgpu-symbol-check
>+++ b/amdgpu/amdgpu-symbol-check
>@@ -3,7 +3,7 @@
> # The following symbols (past the first five) are taken from the public headers.
> # A list of the latter should be available Makefile.am/libdrm_amdgpuinclude_HEADERS
> 
>-FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_amdgpu.so} | awk '{print $3}' | while read func; do
>+FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_amdgpu.so} | awk '{print $3}' | while read func; do
> ( grep -q "^$func$" || echo $func )  <<EOF
> __bss_start
> _edata
>diff --git a/configure.ac b/configure.ac
>index 330358a..67f3e4e 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -44,6 +44,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
> # Check for programs
> AC_PROG_CC
> AC_PROG_CC_C99
>+AC_PROG_NM
> 
> if test "x$ac_cv_prog_cc_c99" = xno; then
> 	AC_MSG_ERROR([Building libdrm requires C99 enabled compiler])
>diff --git a/exynos/exynos-symbol-check b/exynos/exynos-symbol-check
>index 9692caa..e9f1b04 100755
>--- a/exynos/exynos-symbol-check
>+++ b/exynos/exynos-symbol-check
>@@ -3,7 +3,7 @@
> # The following symbols (past the first five) are taken from the public headers.
> # A list of the latter should be available Makefile.am/libdrm_exynos*_HEADERS
> 
>-FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_exynos.so} | awk '{print $3}'| while read func; do
>+FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_exynos.so} | awk '{print $3}'| while read func; do
> ( grep -q "^$func$" || echo $func )  <<EOF
> __bss_start
> _edata
>diff --git a/freedreno/freedreno-symbol-check b/freedreno/freedreno-symbol-check
>index 7b31a34..20826d6 100755
>--- a/freedreno/freedreno-symbol-check
>+++ b/freedreno/freedreno-symbol-check
>@@ -3,7 +3,7 @@
> # The following symbols (past the first five) are taken from the public headers.
> # A list of the latter should be available Makefile.sources/LIBDRM_FREEDRENO_H_FILES
> 
>-FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_freedreno.so} | awk '{print $3}'| while read func; do
>+FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_freedreno.so} | awk '{print $3}'| while read func; do
> ( grep -q "^$func$" || echo $func )  <<EOF
> __bss_start
> _edata
>diff --git a/intel/intel-symbol-check b/intel/intel-symbol-check
>index fd63b37..ca152be 100755
>--- a/intel/intel-symbol-check
>+++ b/intel/intel-symbol-check
>@@ -3,7 +3,7 @@
> # The following symbols (past the first five) are taken from the public headers.
> # A list of the latter should be available Makefile.sources/LIBDRM_INTEL_H_FILES
> 
>-FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_intel.so} | awk '{print $3}' | while read func; do
>+FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_intel.so} | awk '{print $3}' | while read func; do
> ( grep -q "^$func$" || echo $func )  <<EOF
> __bss_start
> _edata
>diff --git a/libkms/kms-symbol-check b/libkms/kms-symbol-check
>index 658b269..a5c2120 100755
>--- a/libkms/kms-symbol-check
>+++ b/libkms/kms-symbol-check
>@@ -3,7 +3,7 @@
> # The following symbols (past the first five) are taken from the public headers.
> # A list of the latter should be available Makefile.sources/LIBKMS_H_FILES
> 
>-FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libkms.so} | awk '{print $3}'| while read func; do
>+FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libkms.so} | awk '{print $3}'| while read func; do
> ( grep -q "^$func$" || echo $func )  <<EOF
> __bss_start
> _edata
>diff --git a/nouveau/nouveau-symbol-check b/nouveau/nouveau-symbol-check
>index b265cea..b3a2410 100755
>--- a/nouveau/nouveau-symbol-check
>+++ b/nouveau/nouveau-symbol-check
>@@ -3,7 +3,7 @@
> # The following symbols (past the first five) are taken from the public headers.
> # A list of the latter should be available Makefile.sources/LIBDRM_NOUVEAU_H_FILES
> 
>-FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_nouveau.so} | awk '{print $3}'| while read func; do
>+FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_nouveau.so} | awk '{print $3}'| while read func; do
> ( grep -q "^$func$" || echo $func )  <<EOF
> __bss_start
> _edata
>diff --git a/omap/omap-symbol-check b/omap/omap-symbol-check
>index 759c84b..0fb4a0f 100755
>--- a/omap/omap-symbol-check
>+++ b/omap/omap-symbol-check
>@@ -3,7 +3,7 @@
> # The following symbols (past the first five) are taken from the public headers.
> # A list of the latter should be available Makefile.am/libdrm_omap*HEADERS
> 
>-FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_omap.so} | awk '{print $3}'| while read func; do
>+FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_omap.so} | awk '{print $3}'| while read func; do
> ( grep -q "^$func$" || echo $func )  <<EOF
> __bss_start
> _edata
>diff --git a/radeon/radeon-symbol-check b/radeon/radeon-symbol-check
>index 0bf2ffc..7d79d90 100755
>--- a/radeon/radeon-symbol-check
>+++ b/radeon/radeon-symbol-check
>@@ -3,7 +3,7 @@
> # The following symbols (past the first five) are taken from the public headers.
> # A list of the latter should be available Makefile.sources/LIBDRM_RADEON_H_FILES
> 
>-FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_radeon.so} | awk '{print $3}'| while read func; do
>+FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_radeon.so} | awk '{print $3}'| while read func; do
> ( grep -q "^$func$" || echo $func )  <<EOF
> __bss_start
> _edata
>diff --git a/tegra/tegra-symbol-check b/tegra/tegra-symbol-check
>index 4020831..710ae24 100755
>--- a/tegra/tegra-symbol-check
>+++ b/tegra/tegra-symbol-check
>@@ -3,7 +3,7 @@
> # The following symbols (past the first five) are taken from the public headers.
> # A list of the latter should be available Makefile.sources/LIBDRM_FREEDRENO_H_FILES
> 
>-FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_tegra.so} | awk '{print $3}'| while read func; do
>+FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_tegra.so} | awk '{print $3}'| while read func; do
> ( grep -q "^$func$" || echo $func )  <<EOF
> __bss_start
> _edata
>-- 
>2.10.0
>

Actions: View | Splinter Review

Attachments on bug 105163: 137439

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.