[igt-dev] [PATCH v2 i-g-t] meson: Allow source location to be configurable

[Petri Latvala]

On Tue, Mar 02, 2021 at 09:58:26AM +0200, Petri Latvala wrote:
> On Tue, Mar 02, 2021 at 12:06:32AM +0000, Richard Purdie wrote:
> > Hardcoding a build source path inside a binary when cross compiling isn't
> > appropriate and breaks build reproducibility. Allow the srcdir to be
> > specified by an optional configuration option to meson which can
> > be used to override with the correct path.
> > 
> > Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> 
> Reviewed-by: Petri Latvala <petri.latvala at intel.com>

And merged now.


-- 
Petri Latvala



> 
> 
> > ---
> >  lib/meson.build   | 6 +++++-
> >  meson_options.txt | 4 ++++
> >  2 files changed, 9 insertions(+), 1 deletion(-)
> > 
> > diff --git a/lib/meson.build b/lib/meson.build
> > index 114eadde..672b4206 100644
> > --- a/lib/meson.build
> > +++ b/lib/meson.build
> > @@ -125,7 +125,11 @@ if chamelium.found()
> >  	lib_sources += 'igt_chamelium_stream.c'
> >  endif
> >  
> > -srcdir = join_paths(meson.source_root(), 'tests')
> > +if get_option('srcdir') != ''
> > +    srcdir = join_paths(get_option('srcdir'), 'tests')
> > +else
> > +    srcdir = join_paths(meson.source_root(), 'tests')
> > +endif
> >  
> >  lib_version = vcs_tag(input : 'version.h.in', output : 'version.h',
> >  		      fallback : 'NO-GIT',
> > diff --git a/meson_options.txt b/meson_options.txt
> > index ff3abf08..bed63efa 100644
> > --- a/meson_options.txt
> > +++ b/meson_options.txt
> > @@ -50,3 +50,7 @@ option('use_rpath',
> >         type : 'boolean',
> >         value : false,
> >         description : 'Set runpath on installed executables for libigt.so')
> > +
> > +option('srcdir',
> > +       type : 'string',
> > +       description : 'Override the source code path embedded inside target binaries (optional)')
> > -- 
> > 2.27.0
> > 
> > _______________________________________________
> > igt-dev mailing list
> > igt-dev at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/igt-dev
> _______________________________________________
> igt-dev mailing list
> igt-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev