| Message ID | 20170914011100.7743-1-jordan.l.justen@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Meson detects if an input file is executable, and copies that to the
output file.
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
tools/intel_aubdump.in | 0
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 100755 tools/intel_aubdump.in
diff --git a/tools/intel_aubdump.in b/tools/intel_aubdump.in
old mode 100644
new mode 100755
On Wed, Sep 13, 2017 at 06:10:55PM -0700, Jordan Justen wrote: > The meson shared_library function appears to hard code prefixing the > library name with 'lib'. > > Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> > --- > tools/Makefile.am | 2 +- > tools/intel_aubdump.in | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/Makefile.am b/tools/Makefile.am > index 2c7b5799..73811060 100644 > --- a/tools/Makefile.am > +++ b/tools/Makefile.am > @@ -24,7 +24,7 @@ AM_LDFLAGS = -Wl,--as-needed > > # aubdumper > > -module_LTLIBRARIES = intel_aubdump.la > +module_LTLIBRARIES = libintel_aubdump.la > moduledir = $(libdir) > intel_aubdump_la_LDFLAGS = -module -avoid-version -no-undefined > intel_aubdump_la_SOURCES = aubdump.c > diff --git a/tools/intel_aubdump.in b/tools/intel_aubdump.in > index 977fe951..8bc6b19d 100644 > --- a/tools/intel_aubdump.in > +++ b/tools/intel_aubdump.in > @@ -105,7 +105,7 @@ prefix=@prefix@ > exec_prefix=@exec_prefix@ > libdir=@libdir@ > > -LD_PRELOAD=${libdir}/intel_aubdump.so${LD_PPRELOAD:+:${LD_PRELOAD}} \ > +LD_PRELOAD=${libdir}/libintel_aubdump.so${LD_PPRELOAD:+:${LD_PRELOAD}} \ > exec -- "$@" 3<<EOF Ville's series makes meson build intel_aubdump.so instead. Can you take a look at his series and slap reviews where appropriate? https://patchwork.freedesktop.org/series/30155/
On 2017-09-14 04:46:00, Petri Latvala wrote: > On Wed, Sep 13, 2017 at 06:10:55PM -0700, Jordan Justen wrote: > > The meson shared_library function appears to hard code prefixing the > > library name with 'lib'. > > > > Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> > > --- > > tools/Makefile.am | 2 +- > > tools/intel_aubdump.in | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/tools/Makefile.am b/tools/Makefile.am > > index 2c7b5799..73811060 100644 > > --- a/tools/Makefile.am > > +++ b/tools/Makefile.am > > @@ -24,7 +24,7 @@ AM_LDFLAGS = -Wl,--as-needed > > > > # aubdumper > > > > -module_LTLIBRARIES = intel_aubdump.la > > +module_LTLIBRARIES = libintel_aubdump.la > > moduledir = $(libdir) > > intel_aubdump_la_LDFLAGS = -module -avoid-version -no-undefined > > intel_aubdump_la_SOURCES = aubdump.c > > diff --git a/tools/intel_aubdump.in b/tools/intel_aubdump.in > > index 977fe951..8bc6b19d 100644 > > --- a/tools/intel_aubdump.in > > +++ b/tools/intel_aubdump.in > > @@ -105,7 +105,7 @@ prefix=@prefix@ > > exec_prefix=@exec_prefix@ > > libdir=@libdir@ > > > > -LD_PRELOAD=${libdir}/intel_aubdump.so${LD_PPRELOAD:+:${LD_PRELOAD}} \ > > +LD_PRELOAD=${libdir}/libintel_aubdump.so${LD_PPRELOAD:+:${LD_PRELOAD}} \ > > exec -- "$@" 3<<EOF > > > Ville's series makes meson build intel_aubdump.so instead. Can you > take a look at his series and slap reviews where appropriate? Oh, nice. I'll talk a look. Ville, Petri: After skimming Ville's series, it looks like maybe patches 2, 4 and 5 from this series might still be useful. Or, did I miss similar patches on the list for that as well? -Jordan
On Wed, Sep 13, 2017 at 06:10:58PM -0700, Jordan Justen wrote: > Meson detects if an input file is executable, and copies that to the > output file. > > Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > tools/intel_aubdump.in | 0 > 1 file changed, 0 insertions(+), 0 deletions(-) > mode change 100644 => 100755 tools/intel_aubdump.in > > diff --git a/tools/intel_aubdump.in b/tools/intel_aubdump.in > old mode 100644 > new mode 100755 > -- > 2.14.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/tools/Makefile.am b/tools/Makefile.am index 2c7b5799..73811060 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -24,7 +24,7 @@ AM_LDFLAGS = -Wl,--as-needed # aubdumper -module_LTLIBRARIES = intel_aubdump.la +module_LTLIBRARIES = libintel_aubdump.la moduledir = $(libdir) intel_aubdump_la_LDFLAGS = -module -avoid-version -no-undefined intel_aubdump_la_SOURCES = aubdump.c diff --git a/tools/intel_aubdump.in b/tools/intel_aubdump.in index 977fe951..8bc6b19d 100644 --- a/tools/intel_aubdump.in +++ b/tools/intel_aubdump.in @@ -105,7 +105,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -LD_PRELOAD=${libdir}/intel_aubdump.so${LD_PPRELOAD:+:${LD_PRELOAD}} \ +LD_PRELOAD=${libdir}/libintel_aubdump.so${LD_PPRELOAD:+:${LD_PRELOAD}} \ exec -- "$@" 3<<EOF `echo -e $args` EOF
The meson shared_library function appears to hard code prefixing the library name with 'lib'. Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> --- tools/Makefile.am | 2 +- tools/intel_aubdump.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)