* [PATCH i-g-t] meson: Install the (dis)assembler
@ 2017-09-15 13:35 Ville Syrjala
2017-09-15 13:59 ` [PATCH i-g-t] meson: Fix IGT_GIT_SHA1 handling Ville Syrjala
` (5 more replies)
0 siblings, 6 replies; 9+ messages in thread
From: Ville Syrjala @ 2017-09-15 13:35 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Install the assembler and disassemebler binaries, and the accompanying
pkg-config file. Change libbrw into a static library since we don't want
to install that.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
assembler/meson.build | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/assembler/meson.build b/assembler/meson.build
index bdddd0e2db25..b5ac678d2950 100644
--- a/assembler/meson.build
+++ b/assembler/meson.build
@@ -11,8 +11,8 @@ lib_brw_src = [
'ralloc.c',
]
-lib_brw = shared_library('brw', lib_brw_src,
- dependencies : igt_deps)
+lib_brw = static_library('brw', lib_brw_src,
+ dependencies : igt_deps)
flex = find_program('flex')
bison = find_program('bison')
@@ -29,9 +29,22 @@ pgen = generator(bison,
pfiles = pgen.process('gram.y')
-executable('intel-gen4asm', 'main.c', lfiles, pfiles, link_with : lib_brw)
+executable('intel-gen4asm', 'main.c', lfiles, pfiles,
+ link_with : lib_brw, install : true)
-executable('intel-gen4disasm', 'disasm-main.c', link_with : lib_brw)
+executable('intel-gen4disasm', 'disasm-main.c',
+ link_with : lib_brw, install : true)
+
+pkgconfigdir = join_paths(get_option('libdir'), 'pgkconfig')
+
+conf_data = configuration_data()
+conf_data.set('prefix', get_option('prefix'))
+conf_data.set('exec_prefix', '${prefix}')
+conf_data.set('libdir', join_paths('${prefix}', get_option('libdir')))
+conf_data.set('includedir', join_paths('${prefix}', get_option('includedir')))
+conf_data.set('VERSION', meson.project_version())
+configure_file(input : 'intel-gen4asm.pc.in', output : 'intel-gen4asm.pc',
+ configuration : conf_data, install_dir : pkgconfigdir)
gen4asm_testcases = [
'test/mov',
--
2.13.5
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH i-g-t] meson: Fix IGT_GIT_SHA1 handling
2017-09-15 13:35 [PATCH i-g-t] meson: Install the (dis)assembler Ville Syrjala
@ 2017-09-15 13:59 ` Ville Syrjala
2017-09-15 20:52 ` Jordan Justen
2017-09-15 14:04 ` ✓ Fi.CI.BAT: success for meson: Install the (dis)assembler Patchwork
` (4 subsequent siblings)
5 siblings, 1 reply; 9+ messages in thread
From: Ville Syrjala @ 2017-09-15 13:59 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tell meson about the dependency on version.h. Avoids the compiler
falling over on account of IGT_GIT_SHA1 not being there.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
lib/meson.build | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/meson.build b/lib/meson.build
index 0d379d90d889..203be520fd3f 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -140,9 +140,9 @@ install_headers(lib_headers)
pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), 'intel-gpu-tools')
srcdir = join_paths(meson.source_root(), 'tests')
-vcs_tag(input : 'version.h.in', output : 'version.h',
- fallback : 'NO-GIT',
- command : [ 'git', 'log', '-n1', '--pretty=format:g%h' ] )
+lib_version = vcs_tag(input : 'version.h.in', output : 'version.h',
+ fallback : 'NO-GIT',
+ command : [ 'git', 'log', '-n1', '--pretty=format:g%h' ] )
lib_intermediates = []
foreach f: lib_sources
@@ -154,7 +154,7 @@ foreach f: lib_sources
endif
lib = static_library('igt-' + name,
- f,
+ [ f, lib_version ],
include_directories: inc,
dependencies : lib_deps,
c_args : [
--
2.13.5
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread
* ✓ Fi.CI.BAT: success for meson: Install the (dis)assembler
2017-09-15 13:35 [PATCH i-g-t] meson: Install the (dis)assembler Ville Syrjala
2017-09-15 13:59 ` [PATCH i-g-t] meson: Fix IGT_GIT_SHA1 handling Ville Syrjala
@ 2017-09-15 14:04 ` Patchwork
2017-09-15 14:22 ` ✓ Fi.CI.BAT: success for meson: Install the (dis)assembler (rev2) Patchwork
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2017-09-15 14:04 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
== Series Details ==
Series: meson: Install the (dis)assembler
URL : https://patchwork.freedesktop.org/series/30420/
State : success
== Summary ==
IGT patchset tested on top of latest successful build
93f72b23156589964b87bb9ca7c94c104976303c meson: Process intel_aubdump.in into intel_aubdump
with latest DRM-Tip kernel build CI_DRM_3094
9adc9e93d624 drm-tip: 2017y-09m-15d-11h-44m-46s UTC integration manifest
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-atomic:
fail -> PASS (fi-snb-2600) fdo#100215
Test pm_rpm:
Subgroup basic-rte:
pass -> DMESG-WARN (fi-cfl-s) fdo#102294
fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fdo#102294 https://bugs.freedesktop.org/show_bug.cgi?id=102294
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:449s
fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:451s
fi-blb-e6850 total:289 pass:224 dwarn:1 dfail:0 fail:0 skip:64 time:377s
fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:535s
fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:270s
fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:511s
fi-byt-j1900 total:289 pass:254 dwarn:1 dfail:0 fail:0 skip:34 time:510s
fi-byt-n2820 total:289 pass:250 dwarn:1 dfail:0 fail:0 skip:38 time:500s
fi-cfl-s total:289 pass:222 dwarn:35 dfail:0 fail:0 skip:32 time:556s
fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:421s
fi-glk-2a total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:598s
fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:430s
fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:417s
fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:448s
fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:496s
fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:465s
fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:490s
fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:581s
fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:584s
fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:457s
fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:529s
fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:506s
fi-skl-x1585l total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:486s
fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:1 skip:39 time:434s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_189/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* ✓ Fi.CI.BAT: success for meson: Install the (dis)assembler (rev2)
2017-09-15 13:35 [PATCH i-g-t] meson: Install the (dis)assembler Ville Syrjala
2017-09-15 13:59 ` [PATCH i-g-t] meson: Fix IGT_GIT_SHA1 handling Ville Syrjala
2017-09-15 14:04 ` ✓ Fi.CI.BAT: success for meson: Install the (dis)assembler Patchwork
@ 2017-09-15 14:22 ` Patchwork
2017-09-15 16:00 ` ✗ Fi.CI.IGT: warning for meson: Install the (dis)assembler Patchwork
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2017-09-15 14:22 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
== Series Details ==
Series: meson: Install the (dis)assembler (rev2)
URL : https://patchwork.freedesktop.org/series/30420/
State : success
== Summary ==
IGT patchset tested on top of latest successful build
93f72b23156589964b87bb9ca7c94c104976303c meson: Process intel_aubdump.in into intel_aubdump
with latest DRM-Tip kernel build CI_DRM_3094
9adc9e93d624 drm-tip: 2017y-09m-15d-11h-44m-46s UTC integration manifest
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-atomic:
fail -> PASS (fi-snb-2600) fdo#100215 +1
Test kms_frontbuffer_tracking:
Subgroup basic:
pass -> DMESG-WARN (fi-bdw-5557u) fdo#102473
fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fdo#102473 https://bugs.freedesktop.org/show_bug.cgi?id=102473
fi-bdw-5557u total:289 pass:267 dwarn:1 dfail:0 fail:0 skip:21 time:448s
fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:459s
fi-blb-e6850 total:289 pass:224 dwarn:1 dfail:0 fail:0 skip:64 time:384s
fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:541s
fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:271s
fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:509s
fi-byt-j1900 total:289 pass:254 dwarn:1 dfail:0 fail:0 skip:34 time:506s
fi-byt-n2820 total:289 pass:250 dwarn:1 dfail:0 fail:0 skip:38 time:503s
fi-cfl-s total:289 pass:223 dwarn:34 dfail:0 fail:0 skip:32 time:553s
fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:422s
fi-glk-2a total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:600s
fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:431s
fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:416s
fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:440s
fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:490s
fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:467s
fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:490s
fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:582s
fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:588s
fi-pnv-d510 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:560s
fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:464s
fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:526s
fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:505s
fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:461s
fi-skl-x1585l total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:491s
fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:578s
fi-snb-2600 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:433s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_190/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* ✗ Fi.CI.IGT: warning for meson: Install the (dis)assembler
2017-09-15 13:35 [PATCH i-g-t] meson: Install the (dis)assembler Ville Syrjala
` (2 preceding siblings ...)
2017-09-15 14:22 ` ✓ Fi.CI.BAT: success for meson: Install the (dis)assembler (rev2) Patchwork
@ 2017-09-15 16:00 ` Patchwork
2017-09-15 16:55 ` ✓ Fi.CI.IGT: success for meson: Install the (dis)assembler (rev2) Patchwork
2017-09-15 20:51 ` [PATCH i-g-t] meson: Install the (dis)assembler Jordan Justen
5 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2017-09-15 16:00 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
== Series Details ==
Series: meson: Install the (dis)assembler
URL : https://patchwork.freedesktop.org/series/30420/
State : warning
== Summary ==
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-indfb-fliptrack:
pass -> DMESG-WARN (shard-hsw)
Test kms_atomic_transition:
Subgroup plane-all-transition-nonblocking:
pass -> FAIL (shard-hsw) fdo#102671
Test perf:
Subgroup blocking:
fail -> PASS (shard-hsw) fdo#102252
Test kms_setmode:
Subgroup basic:
fail -> PASS (shard-hsw) fdo#99912
fdo#102671 https://bugs.freedesktop.org/show_bug.cgi?id=102671
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
shard-hsw total:2267 pass:1223 dwarn:1 dfail:0 fail:12 skip:1031 time:9374s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_189/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* ✓ Fi.CI.IGT: success for meson: Install the (dis)assembler (rev2)
2017-09-15 13:35 [PATCH i-g-t] meson: Install the (dis)assembler Ville Syrjala
` (3 preceding siblings ...)
2017-09-15 16:00 ` ✗ Fi.CI.IGT: warning for meson: Install the (dis)assembler Patchwork
@ 2017-09-15 16:55 ` Patchwork
2017-09-15 20:51 ` [PATCH i-g-t] meson: Install the (dis)assembler Jordan Justen
5 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2017-09-15 16:55 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
== Series Details ==
Series: meson: Install the (dis)assembler (rev2)
URL : https://patchwork.freedesktop.org/series/30420/
State : success
== Summary ==
Test kms_setmode:
Subgroup basic:
fail -> PASS (shard-hsw) fdo#99912
Test perf:
Subgroup polling:
pass -> FAIL (shard-hsw) fdo#102252
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
shard-hsw total:2313 pass:1245 dwarn:0 dfail:0 fail:13 skip:1055 time:9473s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_190/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH i-g-t] meson: Install the (dis)assembler
2017-09-15 13:35 [PATCH i-g-t] meson: Install the (dis)assembler Ville Syrjala
` (4 preceding siblings ...)
2017-09-15 16:55 ` ✓ Fi.CI.IGT: success for meson: Install the (dis)assembler (rev2) Patchwork
@ 2017-09-15 20:51 ` Jordan Justen
5 siblings, 0 replies; 9+ messages in thread
From: Jordan Justen @ 2017-09-15 20:51 UTC (permalink / raw)
To: Ville Syrjala, intel-gfx
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
On 2017-09-15 06:35:52, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Install the assembler and disassemebler binaries, and the accompanying
> pkg-config file. Change libbrw into a static library since we don't want
> to install that.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> assembler/meson.build | 21 +++++++++++++++++----
> 1 file changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/assembler/meson.build b/assembler/meson.build
> index bdddd0e2db25..b5ac678d2950 100644
> --- a/assembler/meson.build
> +++ b/assembler/meson.build
> @@ -11,8 +11,8 @@ lib_brw_src = [
> 'ralloc.c',
> ]
>
> -lib_brw = shared_library('brw', lib_brw_src,
> - dependencies : igt_deps)
> +lib_brw = static_library('brw', lib_brw_src,
> + dependencies : igt_deps)
>
> flex = find_program('flex')
> bison = find_program('bison')
> @@ -29,9 +29,22 @@ pgen = generator(bison,
>
> pfiles = pgen.process('gram.y')
>
> -executable('intel-gen4asm', 'main.c', lfiles, pfiles, link_with : lib_brw)
> +executable('intel-gen4asm', 'main.c', lfiles, pfiles,
> + link_with : lib_brw, install : true)
>
> -executable('intel-gen4disasm', 'disasm-main.c', link_with : lib_brw)
> +executable('intel-gen4disasm', 'disasm-main.c',
> + link_with : lib_brw, install : true)
> +
> +pkgconfigdir = join_paths(get_option('libdir'), 'pgkconfig')
> +
> +conf_data = configuration_data()
> +conf_data.set('prefix', get_option('prefix'))
> +conf_data.set('exec_prefix', '${prefix}')
> +conf_data.set('libdir', join_paths('${prefix}', get_option('libdir')))
> +conf_data.set('includedir', join_paths('${prefix}', get_option('includedir')))
> +conf_data.set('VERSION', meson.project_version())
> +configure_file(input : 'intel-gen4asm.pc.in', output : 'intel-gen4asm.pc',
> + configuration : conf_data, install_dir : pkgconfigdir)
>
> gen4asm_testcases = [
> 'test/mov',
> --
> 2.13.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH i-g-t] meson: Fix IGT_GIT_SHA1 handling
2017-09-15 13:59 ` [PATCH i-g-t] meson: Fix IGT_GIT_SHA1 handling Ville Syrjala
@ 2017-09-15 20:52 ` Jordan Justen
2017-09-18 13:11 ` Ville Syrjälä
0 siblings, 1 reply; 9+ messages in thread
From: Jordan Justen @ 2017-09-15 20:52 UTC (permalink / raw)
To: Ville Syrjala, intel-gfx
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
On 2017-09-15 06:59:54, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Tell meson about the dependency on version.h. Avoids the compiler
> falling over on account of IGT_GIT_SHA1 not being there.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> lib/meson.build | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/lib/meson.build b/lib/meson.build
> index 0d379d90d889..203be520fd3f 100644
> --- a/lib/meson.build
> +++ b/lib/meson.build
> @@ -140,9 +140,9 @@ install_headers(lib_headers)
> pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), 'intel-gpu-tools')
> srcdir = join_paths(meson.source_root(), 'tests')
>
> -vcs_tag(input : 'version.h.in', output : 'version.h',
> - fallback : 'NO-GIT',
> - command : [ 'git', 'log', '-n1', '--pretty=format:g%h' ] )
> +lib_version = vcs_tag(input : 'version.h.in', output : 'version.h',
> + fallback : 'NO-GIT',
> + command : [ 'git', 'log', '-n1', '--pretty=format:g%h' ] )
>
> lib_intermediates = []
> foreach f: lib_sources
> @@ -154,7 +154,7 @@ foreach f: lib_sources
> endif
>
> lib = static_library('igt-' + name,
> - f,
> + [ f, lib_version ],
> include_directories: inc,
> dependencies : lib_deps,
> c_args : [
> --
> 2.13.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH i-g-t] meson: Fix IGT_GIT_SHA1 handling
2017-09-15 20:52 ` Jordan Justen
@ 2017-09-18 13:11 ` Ville Syrjälä
0 siblings, 0 replies; 9+ messages in thread
From: Ville Syrjälä @ 2017-09-18 13:11 UTC (permalink / raw)
To: Jordan Justen; +Cc: intel-gfx
On Fri, Sep 15, 2017 at 01:52:39PM -0700, Jordan Justen wrote:
> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Both patches pushed. Thanks for the review.
>
> On 2017-09-15 06:59:54, Ville Syrjala wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > Tell meson about the dependency on version.h. Avoids the compiler
> > falling over on account of IGT_GIT_SHA1 not being there.
> >
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> > lib/meson.build | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/lib/meson.build b/lib/meson.build
> > index 0d379d90d889..203be520fd3f 100644
> > --- a/lib/meson.build
> > +++ b/lib/meson.build
> > @@ -140,9 +140,9 @@ install_headers(lib_headers)
> > pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), 'intel-gpu-tools')
> > srcdir = join_paths(meson.source_root(), 'tests')
> >
> > -vcs_tag(input : 'version.h.in', output : 'version.h',
> > - fallback : 'NO-GIT',
> > - command : [ 'git', 'log', '-n1', '--pretty=format:g%h' ] )
> > +lib_version = vcs_tag(input : 'version.h.in', output : 'version.h',
> > + fallback : 'NO-GIT',
> > + command : [ 'git', 'log', '-n1', '--pretty=format:g%h' ] )
> >
> > lib_intermediates = []
> > foreach f: lib_sources
> > @@ -154,7 +154,7 @@ foreach f: lib_sources
> > endif
> >
> > lib = static_library('igt-' + name,
> > - f,
> > + [ f, lib_version ],
> > include_directories: inc,
> > dependencies : lib_deps,
> > c_args : [
> > --
> > 2.13.5
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-09-18 13:12 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-15 13:35 [PATCH i-g-t] meson: Install the (dis)assembler Ville Syrjala
2017-09-15 13:59 ` [PATCH i-g-t] meson: Fix IGT_GIT_SHA1 handling Ville Syrjala
2017-09-15 20:52 ` Jordan Justen
2017-09-18 13:11 ` Ville Syrjälä
2017-09-15 14:04 ` ✓ Fi.CI.BAT: success for meson: Install the (dis)assembler Patchwork
2017-09-15 14:22 ` ✓ Fi.CI.BAT: success for meson: Install the (dis)assembler (rev2) Patchwork
2017-09-15 16:00 ` ✗ Fi.CI.IGT: warning for meson: Install the (dis)assembler Patchwork
2017-09-15 16:55 ` ✓ Fi.CI.IGT: success for meson: Install the (dis)assembler (rev2) Patchwork
2017-09-15 20:51 ` [PATCH i-g-t] meson: Install the (dis)assembler Jordan Justen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox