* [PATCH libdrm v2 1/4] meson.build: Fix typo
@ 2019-06-16 13:23 Emil Velikov
2019-06-16 13:23 ` [PATCH libdrm v2 2/4] *symbols-check: use normal shell over bash Emil Velikov
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Emil Velikov @ 2019-06-16 13:23 UTC (permalink / raw)
To: dri-devel; +Cc: Niclas Zeising, Emil Velikov
From: Niclas Zeising <zeising@daemonic.se>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index be768afa..64f0d5b1 100644
--- a/meson.build
+++ b/meson.build
@@ -248,7 +248,7 @@ if prog_xslt.found()
endif
with_man_pages = with_man_pages != 'false' and prog_xslt.found() and prog_sed.found()
-# Used for tets
+# Used for tests
prog_bash = find_program('bash')
config.set10('HAVE_VISIBILITY',
--
2.21.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH libdrm v2 2/4] *symbols-check: use normal shell over bash
2019-06-16 13:23 [PATCH libdrm v2 1/4] meson.build: Fix typo Emil Velikov
@ 2019-06-16 13:23 ` Emil Velikov
2019-06-16 13:56 ` Niclas Zeising
2019-06-16 13:23 ` [PATCH libdrm v2 3/4] meson: normal shell will do Emil Velikov
2019-06-16 13:23 ` [PATCH libdrm v2 4/4] meson.build: Fix meson script on FreeBSD Emil Velikov
2 siblings, 1 reply; 11+ messages in thread
From: Emil Velikov @ 2019-06-16 13:23 UTC (permalink / raw)
To: dri-devel; +Cc: Niclas Zeising, Emil Velikov
None of the tests are bash specific. Tested with bash, zsh, dash, mksh
and ksh.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---
amdgpu/amdgpu-symbol-check | 2 +-
etnaviv/etnaviv-symbol-check | 2 +-
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 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/amdgpu/amdgpu-symbol-check b/amdgpu/amdgpu-symbol-check
index 5ce15f46..ea83850d 100755
--- a/amdgpu/amdgpu-symbol-check
+++ b/amdgpu/amdgpu-symbol-check
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -u
diff --git a/etnaviv/etnaviv-symbol-check b/etnaviv/etnaviv-symbol-check
index 18910688..ef4e66f4 100755
--- a/etnaviv/etnaviv-symbol-check
+++ b/etnaviv/etnaviv-symbol-check
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -u
diff --git a/exynos/exynos-symbol-check b/exynos/exynos-symbol-check
index 49d611e6..d2c362e1 100755
--- a/exynos/exynos-symbol-check
+++ b/exynos/exynos-symbol-check
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -u
diff --git a/freedreno/freedreno-symbol-check b/freedreno/freedreno-symbol-check
index 978026c0..987e38fa 100755
--- a/freedreno/freedreno-symbol-check
+++ b/freedreno/freedreno-symbol-check
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -u
diff --git a/intel/intel-symbol-check b/intel/intel-symbol-check
index de377bef..2f355321 100755
--- a/intel/intel-symbol-check
+++ b/intel/intel-symbol-check
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -u
diff --git a/libkms/kms-symbol-check b/libkms/kms-symbol-check
index 30f444f7..7d3426f6 100755
--- a/libkms/kms-symbol-check
+++ b/libkms/kms-symbol-check
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -u
diff --git a/nouveau/nouveau-symbol-check b/nouveau/nouveau-symbol-check
index 6296244c..36703a3e 100755
--- a/nouveau/nouveau-symbol-check
+++ b/nouveau/nouveau-symbol-check
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -u
diff --git a/omap/omap-symbol-check b/omap/omap-symbol-check
index 16da3c40..21522ba0 100755
--- a/omap/omap-symbol-check
+++ b/omap/omap-symbol-check
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -u
diff --git a/radeon/radeon-symbol-check b/radeon/radeon-symbol-check
index da605bb8..7b69f9a4 100755
--- a/radeon/radeon-symbol-check
+++ b/radeon/radeon-symbol-check
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -u
diff --git a/tegra/tegra-symbol-check b/tegra/tegra-symbol-check
index 8539b95b..a74d9749 100755
--- a/tegra/tegra-symbol-check
+++ b/tegra/tegra-symbol-check
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -u
--
2.21.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH libdrm v2 3/4] meson: normal shell will do
2019-06-16 13:23 [PATCH libdrm v2 1/4] meson.build: Fix typo Emil Velikov
2019-06-16 13:23 ` [PATCH libdrm v2 2/4] *symbols-check: use normal shell over bash Emil Velikov
@ 2019-06-16 13:23 ` Emil Velikov
2019-06-16 14:02 ` Niclas Zeising
2019-06-16 13:23 ` [PATCH libdrm v2 4/4] meson.build: Fix meson script on FreeBSD Emil Velikov
2 siblings, 1 reply; 11+ messages in thread
From: Emil Velikov @ 2019-06-16 13:23 UTC (permalink / raw)
To: dri-devel; +Cc: Niclas Zeising, Emil Velikov
As tweaked with previous patch - bash is not required. Any shell will do
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---
amdgpu/meson.build | 2 +-
etnaviv/meson.build | 2 +-
exynos/meson.build | 2 +-
freedreno/meson.build | 2 +-
intel/meson.build | 14 +++++++-------
libkms/meson.build | 2 +-
meson.build | 2 +-
nouveau/meson.build | 2 +-
omap/meson.build | 2 +-
radeon/meson.build | 2 +-
tegra/meson.build | 2 +-
11 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/amdgpu/meson.build b/amdgpu/meson.build
index 7c8ccc7e..18e30166 100644
--- a/amdgpu/meson.build
+++ b/amdgpu/meson.build
@@ -59,7 +59,7 @@ ext_libdrm_amdgpu = declare_dependency(
test(
'amdgpu-symbol-check',
- prog_bash,
+ prog_sh,
env : env_test,
args : [files('amdgpu-symbol-check'), libdrm_amdgpu]
)
diff --git a/etnaviv/meson.build b/etnaviv/meson.build
index 515a4ed0..82fbc208 100644
--- a/etnaviv/meson.build
+++ b/etnaviv/meson.build
@@ -54,6 +54,6 @@ ext_libdrm_etnaviv = declare_dependency(
test(
'etnaviv-symbol-check',
- prog_bash,
+ prog_sh,
args : [files('etnaviv-symbol-check'), libdrm_etnaviv]
)
diff --git a/exynos/meson.build b/exynos/meson.build
index bdfc3fc6..1de75220 100644
--- a/exynos/meson.build
+++ b/exynos/meson.build
@@ -48,7 +48,7 @@ pkg.generate(
test(
'exynos-symbol-check',
- prog_bash,
+ prog_sh,
env : env_test,
args : [files('exynos-symbol-check'), libdrm_exynos]
)
diff --git a/freedreno/meson.build b/freedreno/meson.build
index c9aba060..277d5ec5 100644
--- a/freedreno/meson.build
+++ b/freedreno/meson.build
@@ -71,7 +71,7 @@ pkg.generate(
test(
'freedreno-symbol-check',
- prog_bash,
+ prog_sh,
env : env_test,
args : [files('freedreno-symbol-check'), libdrm_freedreno]
)
diff --git a/intel/meson.build b/intel/meson.build
index 3d6bbac6..6f149c74 100644
--- a/intel/meson.build
+++ b/intel/meson.build
@@ -64,43 +64,43 @@ test_decode = executable(
test(
'gen4-3d.batch',
- prog_bash,
+ prog_sh,
args : files('tests/gen4-3d.batch.sh'),
workdir : meson.current_build_dir(),
)
test(
'gen45-3d.batch',
- prog_bash,
+ prog_sh,
args : files('tests/gm45-3d.batch.sh'),
workdir : meson.current_build_dir(),
)
test(
'gen5-3d.batch',
- prog_bash,
+ prog_sh,
args : files('tests/gen5-3d.batch.sh'),
workdir : meson.current_build_dir(),
)
test(
'gen6-3d.batch',
- prog_bash,
+ prog_sh,
args : files('tests/gen6-3d.batch.sh'),
workdir : meson.current_build_dir(),
)
test(
'gen7-3d.batch',
- prog_bash,
+ prog_sh,
args : files('tests/gen7-3d.batch.sh'),
workdir : meson.current_build_dir(),
)
test(
'gen7-2d-copy.batch',
- prog_bash,
+ prog_sh,
args : files('tests/gen7-2d-copy.batch.sh'),
workdir : meson.current_build_dir(),
)
test(
'intel-symbol-check',
- prog_bash,
+ prog_sh,
env : env_test,
args : [files('intel-symbol-check'), libdrm_intel]
)
diff --git a/libkms/meson.build b/libkms/meson.build
index dc931608..7b8d34ad 100644
--- a/libkms/meson.build
+++ b/libkms/meson.build
@@ -69,7 +69,7 @@ pkg.generate(
test(
'kms-symbol-check',
- prog_bash,
+ prog_sh,
env : env_test,
args : [files('kms-symbol-check'), libkms]
)
diff --git a/meson.build b/meson.build
index 64f0d5b1..ed407009 100644
--- a/meson.build
+++ b/meson.build
@@ -249,7 +249,7 @@ endif
with_man_pages = with_man_pages != 'false' and prog_xslt.found() and prog_sed.found()
# Used for tests
-prog_bash = find_program('bash')
+prog_sh = find_program('sh')
config.set10('HAVE_VISIBILITY',
cc.compiles('''int foo_hidden(void) __attribute__((visibility(("hidden"))));''',
diff --git a/nouveau/meson.build b/nouveau/meson.build
index 0c1498d7..eda0fd3d 100644
--- a/nouveau/meson.build
+++ b/nouveau/meson.build
@@ -53,7 +53,7 @@ pkg.generate(
test(
'nouveau-symbol-check',
- prog_bash,
+ prog_sh,
env : env_test,
args : [files('nouveau-symbol-check'), libdrm_nouveau]
)
diff --git a/omap/meson.build b/omap/meson.build
index 54698c6a..7c11b5e8 100644
--- a/omap/meson.build
+++ b/omap/meson.build
@@ -48,7 +48,7 @@ pkg.generate(
test(
'omap-symbol-check',
- prog_bash,
+ prog_sh,
env : env_test,
args : [files('omap-symbol-check'), libdrm_omap]
)
diff --git a/radeon/meson.build b/radeon/meson.build
index 1fc5282c..d272800f 100644
--- a/radeon/meson.build
+++ b/radeon/meson.build
@@ -58,7 +58,7 @@ pkg.generate(
test(
'radeon-symbol-check',
- prog_bash,
+ prog_sh,
env : env_test,
args : [files('radeon-symbol-check'), libdrm_radeon]
)
diff --git a/tegra/meson.build b/tegra/meson.build
index 4bc454b6..f385f72e 100644
--- a/tegra/meson.build
+++ b/tegra/meson.build
@@ -47,7 +47,7 @@ pkg.generate(
test(
'tegra-symbol-check',
- prog_bash,
+ prog_sh,
env : env_test,
args : [files('tegra-symbol-check'), libdrm_tegra]
)
--
2.21.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH libdrm v2 4/4] meson.build: Fix meson script on FreeBSD
2019-06-16 13:23 [PATCH libdrm v2 1/4] meson.build: Fix typo Emil Velikov
2019-06-16 13:23 ` [PATCH libdrm v2 2/4] *symbols-check: use normal shell over bash Emil Velikov
2019-06-16 13:23 ` [PATCH libdrm v2 3/4] meson: normal shell will do Emil Velikov
@ 2019-06-16 13:23 ` Emil Velikov
2019-06-16 14:03 ` Niclas Zeising
2019-06-17 9:14 ` Eric Engestrom
2 siblings, 2 replies; 11+ messages in thread
From: Emil Velikov @ 2019-06-16 13:23 UTC (permalink / raw)
To: dri-devel; +Cc: Niclas Zeising, Emil Velikov
From: Niclas Zeising <zeising@daemonic.se>
FreeBSD requires sys/types.h for sys/sysctl.h, add it as part of the
includes when checking for headers.
Instead of splitting out the check for sys/sysctl.h from the other
header checks, just add sys/types.h to all header checks.
v2 [Emil]
- add inline comment
- drop bash/sh hunk
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---
meson.build | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index ed407009..14f82b1f 100644
--- a/meson.build
+++ b/meson.build
@@ -179,9 +179,12 @@ else
dep_rt = []
endif
dep_m = cc.find_library('m', required : false)
+# From Niclas Zeising:
+# FreeBSD requires sys/types.h for sys/sysctl.h, add it as part of the
+# includes when checking for headers.
foreach header : ['sys/sysctl.h', 'sys/select.h', 'alloca.h']
config.set('HAVE_' + header.underscorify().to_upper(),
- cc.compiles('#include <@0@>'.format(header), name : '@0@ works'.format(header)))
+ cc.compiles('#include <sys/types.h>\n#include <@0@>'.format(header), name : '@0@ works'.format(header)))
endforeach
if cc.has_header_symbol('sys/sysmacros.h', 'major')
config.set10('MAJOR_IN_SYSMACROS', true)
--
2.21.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH libdrm v2 2/4] *symbols-check: use normal shell over bash
2019-06-16 13:23 ` [PATCH libdrm v2 2/4] *symbols-check: use normal shell over bash Emil Velikov
@ 2019-06-16 13:56 ` Niclas Zeising
0 siblings, 0 replies; 11+ messages in thread
From: Niclas Zeising @ 2019-06-16 13:56 UTC (permalink / raw)
To: Emil Velikov, dri-devel
On 2019-06-16 15:23, Emil Velikov wrote:
> None of the tests are bash specific. Tested with bash, zsh, dash, mksh
> and ksh.
>
> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Tested-by: Niclas Zeising <zeising@daemonic.se>
Reviewed-by: Niclas Zeising <zeising@daemonic.se>
> ---
> amdgpu/amdgpu-symbol-check | 2 +-
> etnaviv/etnaviv-symbol-check | 2 +-
> 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 +-
> 10 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/amdgpu/amdgpu-symbol-check b/amdgpu/amdgpu-symbol-check
> index 5ce15f46..ea83850d 100755
> --- a/amdgpu/amdgpu-symbol-check
> +++ b/amdgpu/amdgpu-symbol-check
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/bin/sh
>
> set -u
>
> diff --git a/etnaviv/etnaviv-symbol-check b/etnaviv/etnaviv-symbol-check
> index 18910688..ef4e66f4 100755
> --- a/etnaviv/etnaviv-symbol-check
> +++ b/etnaviv/etnaviv-symbol-check
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/bin/sh
>
> set -u
>
> diff --git a/exynos/exynos-symbol-check b/exynos/exynos-symbol-check
> index 49d611e6..d2c362e1 100755
> --- a/exynos/exynos-symbol-check
> +++ b/exynos/exynos-symbol-check
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/bin/sh
>
> set -u
>
> diff --git a/freedreno/freedreno-symbol-check b/freedreno/freedreno-symbol-check
> index 978026c0..987e38fa 100755
> --- a/freedreno/freedreno-symbol-check
> +++ b/freedreno/freedreno-symbol-check
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/bin/sh
>
> set -u
>
> diff --git a/intel/intel-symbol-check b/intel/intel-symbol-check
> index de377bef..2f355321 100755
> --- a/intel/intel-symbol-check
> +++ b/intel/intel-symbol-check
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/bin/sh
>
> set -u
>
> diff --git a/libkms/kms-symbol-check b/libkms/kms-symbol-check
> index 30f444f7..7d3426f6 100755
> --- a/libkms/kms-symbol-check
> +++ b/libkms/kms-symbol-check
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/bin/sh
>
> set -u
>
> diff --git a/nouveau/nouveau-symbol-check b/nouveau/nouveau-symbol-check
> index 6296244c..36703a3e 100755
> --- a/nouveau/nouveau-symbol-check
> +++ b/nouveau/nouveau-symbol-check
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/bin/sh
>
> set -u
>
> diff --git a/omap/omap-symbol-check b/omap/omap-symbol-check
> index 16da3c40..21522ba0 100755
> --- a/omap/omap-symbol-check
> +++ b/omap/omap-symbol-check
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/bin/sh
>
> set -u
>
> diff --git a/radeon/radeon-symbol-check b/radeon/radeon-symbol-check
> index da605bb8..7b69f9a4 100755
> --- a/radeon/radeon-symbol-check
> +++ b/radeon/radeon-symbol-check
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/bin/sh
>
> set -u
>
> diff --git a/tegra/tegra-symbol-check b/tegra/tegra-symbol-check
> index 8539b95b..a74d9749 100755
> --- a/tegra/tegra-symbol-check
> +++ b/tegra/tegra-symbol-check
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/bin/sh
>
> set -u
>
>
--
Niclas Zeising
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH libdrm v2 3/4] meson: normal shell will do
2019-06-16 13:23 ` [PATCH libdrm v2 3/4] meson: normal shell will do Emil Velikov
@ 2019-06-16 14:02 ` Niclas Zeising
0 siblings, 0 replies; 11+ messages in thread
From: Niclas Zeising @ 2019-06-16 14:02 UTC (permalink / raw)
To: Emil Velikov, dri-devel
On 2019-06-16 15:23, Emil Velikov wrote:
> As tweaked with previous patch - bash is not required. Any shell will do
>
> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Niclas Zeising <zeising@daemonic.se>
> ---
> amdgpu/meson.build | 2 +-
> etnaviv/meson.build | 2 +-
> exynos/meson.build | 2 +-
> freedreno/meson.build | 2 +-
> intel/meson.build | 14 +++++++-------
> libkms/meson.build | 2 +-
> meson.build | 2 +-
> nouveau/meson.build | 2 +-
> omap/meson.build | 2 +-
> radeon/meson.build | 2 +-
> tegra/meson.build | 2 +-
> 11 files changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/amdgpu/meson.build b/amdgpu/meson.build
> index 7c8ccc7e..18e30166 100644
> --- a/amdgpu/meson.build
> +++ b/amdgpu/meson.build
> @@ -59,7 +59,7 @@ ext_libdrm_amdgpu = declare_dependency(
>
> test(
> 'amdgpu-symbol-check',
> - prog_bash,
> + prog_sh,
> env : env_test,
> args : [files('amdgpu-symbol-check'), libdrm_amdgpu]
> )
> diff --git a/etnaviv/meson.build b/etnaviv/meson.build
> index 515a4ed0..82fbc208 100644
> --- a/etnaviv/meson.build
> +++ b/etnaviv/meson.build
> @@ -54,6 +54,6 @@ ext_libdrm_etnaviv = declare_dependency(
>
> test(
> 'etnaviv-symbol-check',
> - prog_bash,
> + prog_sh,
> args : [files('etnaviv-symbol-check'), libdrm_etnaviv]
> )
> diff --git a/exynos/meson.build b/exynos/meson.build
> index bdfc3fc6..1de75220 100644
> --- a/exynos/meson.build
> +++ b/exynos/meson.build
> @@ -48,7 +48,7 @@ pkg.generate(
>
> test(
> 'exynos-symbol-check',
> - prog_bash,
> + prog_sh,
> env : env_test,
> args : [files('exynos-symbol-check'), libdrm_exynos]
> )
> diff --git a/freedreno/meson.build b/freedreno/meson.build
> index c9aba060..277d5ec5 100644
> --- a/freedreno/meson.build
> +++ b/freedreno/meson.build
> @@ -71,7 +71,7 @@ pkg.generate(
>
> test(
> 'freedreno-symbol-check',
> - prog_bash,
> + prog_sh,
> env : env_test,
> args : [files('freedreno-symbol-check'), libdrm_freedreno]
> )
> diff --git a/intel/meson.build b/intel/meson.build
> index 3d6bbac6..6f149c74 100644
> --- a/intel/meson.build
> +++ b/intel/meson.build
> @@ -64,43 +64,43 @@ test_decode = executable(
>
> test(
> 'gen4-3d.batch',
> - prog_bash,
> + prog_sh,
> args : files('tests/gen4-3d.batch.sh'),
> workdir : meson.current_build_dir(),
> )
> test(
> 'gen45-3d.batch',
> - prog_bash,
> + prog_sh,
> args : files('tests/gm45-3d.batch.sh'),
> workdir : meson.current_build_dir(),
> )
> test(
> 'gen5-3d.batch',
> - prog_bash,
> + prog_sh,
> args : files('tests/gen5-3d.batch.sh'),
> workdir : meson.current_build_dir(),
> )
> test(
> 'gen6-3d.batch',
> - prog_bash,
> + prog_sh,
> args : files('tests/gen6-3d.batch.sh'),
> workdir : meson.current_build_dir(),
> )
> test(
> 'gen7-3d.batch',
> - prog_bash,
> + prog_sh,
> args : files('tests/gen7-3d.batch.sh'),
> workdir : meson.current_build_dir(),
> )
> test(
> 'gen7-2d-copy.batch',
> - prog_bash,
> + prog_sh,
> args : files('tests/gen7-2d-copy.batch.sh'),
> workdir : meson.current_build_dir(),
> )
> test(
> 'intel-symbol-check',
> - prog_bash,
> + prog_sh,
> env : env_test,
> args : [files('intel-symbol-check'), libdrm_intel]
> )
> diff --git a/libkms/meson.build b/libkms/meson.build
> index dc931608..7b8d34ad 100644
> --- a/libkms/meson.build
> +++ b/libkms/meson.build
> @@ -69,7 +69,7 @@ pkg.generate(
>
> test(
> 'kms-symbol-check',
> - prog_bash,
> + prog_sh,
> env : env_test,
> args : [files('kms-symbol-check'), libkms]
> )
> diff --git a/meson.build b/meson.build
> index 64f0d5b1..ed407009 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -249,7 +249,7 @@ endif
> with_man_pages = with_man_pages != 'false' and prog_xslt.found() and prog_sed.found()
>
> # Used for tests
> -prog_bash = find_program('bash')
> +prog_sh = find_program('sh')
>
> config.set10('HAVE_VISIBILITY',
> cc.compiles('''int foo_hidden(void) __attribute__((visibility(("hidden"))));''',
> diff --git a/nouveau/meson.build b/nouveau/meson.build
> index 0c1498d7..eda0fd3d 100644
> --- a/nouveau/meson.build
> +++ b/nouveau/meson.build
> @@ -53,7 +53,7 @@ pkg.generate(
>
> test(
> 'nouveau-symbol-check',
> - prog_bash,
> + prog_sh,
> env : env_test,
> args : [files('nouveau-symbol-check'), libdrm_nouveau]
> )
> diff --git a/omap/meson.build b/omap/meson.build
> index 54698c6a..7c11b5e8 100644
> --- a/omap/meson.build
> +++ b/omap/meson.build
> @@ -48,7 +48,7 @@ pkg.generate(
>
> test(
> 'omap-symbol-check',
> - prog_bash,
> + prog_sh,
> env : env_test,
> args : [files('omap-symbol-check'), libdrm_omap]
> )
> diff --git a/radeon/meson.build b/radeon/meson.build
> index 1fc5282c..d272800f 100644
> --- a/radeon/meson.build
> +++ b/radeon/meson.build
> @@ -58,7 +58,7 @@ pkg.generate(
>
> test(
> 'radeon-symbol-check',
> - prog_bash,
> + prog_sh,
> env : env_test,
> args : [files('radeon-symbol-check'), libdrm_radeon]
> )
> diff --git a/tegra/meson.build b/tegra/meson.build
> index 4bc454b6..f385f72e 100644
> --- a/tegra/meson.build
> +++ b/tegra/meson.build
> @@ -47,7 +47,7 @@ pkg.generate(
>
> test(
> 'tegra-symbol-check',
> - prog_bash,
> + prog_sh,
> env : env_test,
> args : [files('tegra-symbol-check'), libdrm_tegra]
> )
>
--
Niclas Zeising
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH libdrm v2 4/4] meson.build: Fix meson script on FreeBSD
2019-06-16 13:23 ` [PATCH libdrm v2 4/4] meson.build: Fix meson script on FreeBSD Emil Velikov
@ 2019-06-16 14:03 ` Niclas Zeising
2019-06-17 9:14 ` Eric Engestrom
1 sibling, 0 replies; 11+ messages in thread
From: Niclas Zeising @ 2019-06-16 14:03 UTC (permalink / raw)
To: Emil Velikov, dri-devel
On 2019-06-16 15:23, Emil Velikov wrote:
> From: Niclas Zeising <zeising@daemonic.se>
>
> FreeBSD requires sys/types.h for sys/sysctl.h, add it as part of the
> includes when checking for headers.
> Instead of splitting out the check for sys/sysctl.h from the other
> header checks, just add sys/types.h to all header checks.
>
> v2 [Emil]
> - add inline comment
> - drop bash/sh hunk
>
> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Niclas Zeising <zeising@daemonic.se>
> ---
> meson.build | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/meson.build b/meson.build
> index ed407009..14f82b1f 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -179,9 +179,12 @@ else
> dep_rt = []
> endif
> dep_m = cc.find_library('m', required : false)
> +# From Niclas Zeising:
> +# FreeBSD requires sys/types.h for sys/sysctl.h, add it as part of the
> +# includes when checking for headers.
> foreach header : ['sys/sysctl.h', 'sys/select.h', 'alloca.h']
> config.set('HAVE_' + header.underscorify().to_upper(),
> - cc.compiles('#include <@0@>'.format(header), name : '@0@ works'.format(header)))
> + cc.compiles('#include <sys/types.h>\n#include <@0@>'.format(header), name : '@0@ works'.format(header)))
> endforeach
> if cc.has_header_symbol('sys/sysmacros.h', 'major')
> config.set10('MAJOR_IN_SYSMACROS', true)
>
--
Niclas Zeising
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH libdrm v2 4/4] meson.build: Fix meson script on FreeBSD
2019-06-16 13:23 ` [PATCH libdrm v2 4/4] meson.build: Fix meson script on FreeBSD Emil Velikov
2019-06-16 14:03 ` Niclas Zeising
@ 2019-06-17 9:14 ` Eric Engestrom
2019-06-17 9:20 ` Niclas Zeising
1 sibling, 1 reply; 11+ messages in thread
From: Eric Engestrom @ 2019-06-17 9:14 UTC (permalink / raw)
To: Emil Velikov; +Cc: Niclas Zeising, dri-devel
On Sunday, 2019-06-16 14:23:43 +0100, Emil Velikov wrote:
> From: Niclas Zeising <zeising@daemonic.se>
>
> FreeBSD requires sys/types.h for sys/sysctl.h, add it as part of the
> includes when checking for headers.
> Instead of splitting out the check for sys/sysctl.h from the other
> header checks, just add sys/types.h to all header checks.
>
> v2 [Emil]
> - add inline comment
> - drop bash/sh hunk
>
> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Series is:
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
But I agree with Emil, it's a FreeBSD bug for it to not include
a required header, this should also be fixed upstream.
> ---
> meson.build | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/meson.build b/meson.build
> index ed407009..14f82b1f 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -179,9 +179,12 @@ else
> dep_rt = []
> endif
> dep_m = cc.find_library('m', required : false)
> +# From Niclas Zeising:
> +# FreeBSD requires sys/types.h for sys/sysctl.h, add it as part of the
> +# includes when checking for headers.
> foreach header : ['sys/sysctl.h', 'sys/select.h', 'alloca.h']
> config.set('HAVE_' + header.underscorify().to_upper(),
> - cc.compiles('#include <@0@>'.format(header), name : '@0@ works'.format(header)))
> + cc.compiles('#include <sys/types.h>\n#include <@0@>'.format(header), name : '@0@ works'.format(header)))
> endforeach
> if cc.has_header_symbol('sys/sysmacros.h', 'major')
> config.set10('MAJOR_IN_SYSMACROS', true)
> --
> 2.21.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH libdrm v2 4/4] meson.build: Fix meson script on FreeBSD
2019-06-17 9:14 ` Eric Engestrom
@ 2019-06-17 9:20 ` Niclas Zeising
2019-06-17 13:44 ` Eric Engestrom
0 siblings, 1 reply; 11+ messages in thread
From: Niclas Zeising @ 2019-06-17 9:20 UTC (permalink / raw)
To: Eric Engestrom, Emil Velikov; +Cc: dri-devel
On 2019-06-17 11:14, Eric Engestrom wrote:
> On Sunday, 2019-06-16 14:23:43 +0100, Emil Velikov wrote:
>> From: Niclas Zeising <zeising@daemonic.se>
>>
>> FreeBSD requires sys/types.h for sys/sysctl.h, add it as part of the
>> includes when checking for headers.
>> Instead of splitting out the check for sys/sysctl.h from the other
>> header checks, just add sys/types.h to all header checks.
>>
>> v2 [Emil]
>> - add inline comment
>> - drop bash/sh hunk
>>
>> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
>
> Series is:
> Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
>
> But I agree with Emil, it's a FreeBSD bug for it to not include
> a required header, this should also be fixed upstream.
I'm not sure if my e-mails are getting to the mailing list. This is the
way it's documented in FreeBSD, and there is a lot of legacy reasons it
is this way. I doubt it will change, and even if it does, there will be
about 5 years of transition period before all supported releases has the
change, most likely.
This is the first time, to my knowledge, this issue has come up.
(I'm not saying I disagree with you, just saying it's probably easier to
patch here rather than try to change upstream.)
Regards
--
Niclas
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH libdrm v2 4/4] meson.build: Fix meson script on FreeBSD
2019-06-17 9:20 ` Niclas Zeising
@ 2019-06-17 13:44 ` Eric Engestrom
2019-08-01 10:26 ` Niclas Zeising
0 siblings, 1 reply; 11+ messages in thread
From: Eric Engestrom @ 2019-06-17 13:44 UTC (permalink / raw)
To: Niclas Zeising; +Cc: Emil Velikov, dri-devel
On Monday, 2019-06-17 11:20:43 +0200, Niclas Zeising wrote:
> On 2019-06-17 11:14, Eric Engestrom wrote:
> > On Sunday, 2019-06-16 14:23:43 +0100, Emil Velikov wrote:
> > > From: Niclas Zeising <zeising@daemonic.se>
> > >
> > > FreeBSD requires sys/types.h for sys/sysctl.h, add it as part of the
> > > includes when checking for headers.
> > > Instead of splitting out the check for sys/sysctl.h from the other
> > > header checks, just add sys/types.h to all header checks.
> > >
> > > v2 [Emil]
> > > - add inline comment
> > > - drop bash/sh hunk
> > >
> > > Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
> >
> > Series is:
> > Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
> >
> > But I agree with Emil, it's a FreeBSD bug for it to not include
> > a required header, this should also be fixed upstream.
>
> I'm not sure if my e-mails are getting to the mailing list.
They are :)
You can check the archive if you're not sure:
https://lists.freedesktop.org/archives/dri-devel/2019-June/thread.html
> This is the way
> it's documented in FreeBSD, and there is a lot of legacy reasons it is this
> way. I doubt it will change, and even if it does, there will be about 5
> years of transition period before all supported releases has the change,
> most likely.
>
> This is the first time, to my knowledge, this issue has come up.
>
> (I'm not saying I disagree with you, just saying it's probably easier to
> patch here rather than try to change upstream.)
>
> Regards
> --
> Niclas
If think we both agree then ;)
I definitely agree with should have the workaround downstream, all
I meant is that it's worth pushing upstream to fix the bug so that
*eventually* not all downstream users needs to have the workaround (but
yeah, that will take years to reach).
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH libdrm v2 4/4] meson.build: Fix meson script on FreeBSD
2019-06-17 13:44 ` Eric Engestrom
@ 2019-08-01 10:26 ` Niclas Zeising
0 siblings, 0 replies; 11+ messages in thread
From: Niclas Zeising @ 2019-08-01 10:26 UTC (permalink / raw)
To: Eric Engestrom; +Cc: Emil Velikov, dri-devel
On 2019-06-17 15:44, Eric Engestrom wrote:
> On Monday, 2019-06-17 11:20:43 +0200, Niclas Zeising wrote:
>> On 2019-06-17 11:14, Eric Engestrom wrote:
>>> On Sunday, 2019-06-16 14:23:43 +0100, Emil Velikov wrote:
>>>> From: Niclas Zeising <zeising@daemonic.se>
>>>>
>>>> FreeBSD requires sys/types.h for sys/sysctl.h, add it as part of the
>>>> includes when checking for headers.
>>>> Instead of splitting out the check for sys/sysctl.h from the other
>>>> header checks, just add sys/types.h to all header checks.
>>>>
>>>> v2 [Emil]
>>>> - add inline comment
>>>> - drop bash/sh hunk
>>>>
>>>> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
>>>
>>> Series is:
>>> Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
>>>
>>> But I agree with Emil, it's a FreeBSD bug for it to not include
>>> a required header, this should also be fixed upstream.
>>
>> I'm not sure if my e-mails are getting to the mailing list.
>
> They are :)
>
> You can check the archive if you're not sure:
> https://lists.freedesktop.org/archives/dri-devel/2019-June/thread.html
>
>> This is the way
>> it's documented in FreeBSD, and there is a lot of legacy reasons it is this
>> way. I doubt it will change, and even if it does, there will be about 5
>> years of transition period before all supported releases has the change,
>> most likely.
>>
>> This is the first time, to my knowledge, this issue has come up.
>>
>> (I'm not saying I disagree with you, just saying it's probably easier to
>> patch here rather than try to change upstream.)
>>
>> Regards
>> --
>> Niclas
>
> If think we both agree then ;)
> I definitely agree with should have the workaround downstream, all
> I meant is that it's worth pushing upstream to fix the bug so that
> *eventually* not all downstream users needs to have the workaround (but
> yeah, that will take years to reach).
>
Just noticed that these patches still haven't been merged. What's the
hold up?
Thanks!
Regards
--
Niclas Zeising
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-08-01 10:36 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-16 13:23 [PATCH libdrm v2 1/4] meson.build: Fix typo Emil Velikov
2019-06-16 13:23 ` [PATCH libdrm v2 2/4] *symbols-check: use normal shell over bash Emil Velikov
2019-06-16 13:56 ` Niclas Zeising
2019-06-16 13:23 ` [PATCH libdrm v2 3/4] meson: normal shell will do Emil Velikov
2019-06-16 14:02 ` Niclas Zeising
2019-06-16 13:23 ` [PATCH libdrm v2 4/4] meson.build: Fix meson script on FreeBSD Emil Velikov
2019-06-16 14:03 ` Niclas Zeising
2019-06-17 9:14 ` Eric Engestrom
2019-06-17 9:20 ` Niclas Zeising
2019-06-17 13:44 ` Eric Engestrom
2019-08-01 10:26 ` Niclas Zeising
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.