[v1] mesa/meson: 32bit xmlconfig linkage

Submitted by Sergii Romantsov on Sept. 6, 2018, 2:38 p.m.

Details

Message ID 1536244716-32027-1-git-send-email-sergii.romantsov@globallogic.com
State New
Headers show
Series "mesa/meson: 32bit xmlconfig linkage" ( rev: 1 ) in Mesa

Not browsing as part of any series.

Commit Message

Sergii Romantsov Sept. 6, 2018, 2:38 p.m.
Building of 32bit mesa with meson causes linkage issue:
"undefined reference to `util_get_process_name'"
Fixed by adding link-with mesa_util for xmlconfig primary.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107843
Signed-off-by: Sergii Romantsov <sergii.romantsov@globallogic.com>
---
 src/gbm/meson.build  | 2 +-
 src/glx/meson.build  | 2 +-
 src/util/meson.build | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/gbm/meson.build b/src/gbm/meson.build
index 2e9d380..6ca8b38 100644
--- a/src/gbm/meson.build
+++ b/src/gbm/meson.build
@@ -51,7 +51,7 @@  libgbm = shared_library(
   include_directories : incs_gbm,
   c_args : [c_vis_args, args_gbm],
   link_args : [ld_args_gc_sections],
-  link_with : [libloader, libmesa_util, libxmlconfig],
+  link_with : [libloader, libxmlconfig],
   dependencies : [deps_gbm, dep_dl, dep_thread],
   version : '1.0.0',
   install : true,
diff --git a/src/glx/meson.build b/src/glx/meson.build
index dd8ba60..5a97d3e 100644
--- a/src/glx/meson.build
+++ b/src/glx/meson.build
@@ -150,7 +150,7 @@  libglx = static_library(
     '-DGL_LIB_NAME="lib@0@.so.@1@"'.format(gl_lib_name, gl_lib_version.split('.')[0]),
   ],
   link_with : [
-    libloader, libloader_dri3_helper, libmesa_util, libxmlconfig,
+    libloader, libloader_dri3_helper, libxmlconfig,
     extra_libs_libglx,
   ],
   dependencies : [dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_glvnd],
diff --git a/src/util/meson.build b/src/util/meson.build
index a4ff0b9..c5714a7 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -117,6 +117,7 @@  libxmlconfig = static_library(
   'xmlconfig',
   files_xmlconfig,
   include_directories : inc_common,
+  link_with : [libmesa_util],
   dependencies : [dep_expat, dep_m],
   c_args : [
     c_msvc_compat_args, c_vis_args,

Comments

Probably, here is a sense to remove constructions similar to 'libmesa_util,
libxmlconfig' and left only libxmlconfig for the rest of meson.build files.
Any doubts?

On Thu, Sep 6, 2018 at 5:38 PM, Sergii Romantsov <sergii.romantsov@gmail.com
> wrote:

> Building of 32bit mesa with meson causes linkage issue:
> "undefined reference to `util_get_process_name'"
> Fixed by adding link-with mesa_util for xmlconfig primary.
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107843
> Signed-off-by: Sergii Romantsov <sergii.romantsov@globallogic.com>
> ---
>  src/gbm/meson.build  | 2 +-
>  src/glx/meson.build  | 2 +-
>  src/util/meson.build | 1 +
>  3 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/src/gbm/meson.build b/src/gbm/meson.build
> index 2e9d380..6ca8b38 100644
> --- a/src/gbm/meson.build
> +++ b/src/gbm/meson.build
> @@ -51,7 +51,7 @@ libgbm = shared_library(
>    include_directories : incs_gbm,
>    c_args : [c_vis_args, args_gbm],
>    link_args : [ld_args_gc_sections],
> -  link_with : [libloader, libmesa_util, libxmlconfig],
> +  link_with : [libloader, libxmlconfig],
>    dependencies : [deps_gbm, dep_dl, dep_thread],
>    version : '1.0.0',
>    install : true,
> diff --git a/src/glx/meson.build b/src/glx/meson.build
> index dd8ba60..5a97d3e 100644
> --- a/src/glx/meson.build
> +++ b/src/glx/meson.build
> @@ -150,7 +150,7 @@ libglx = static_library(
>      '-DGL_LIB_NAME="lib@0@.so.@1@"'.format(gl_lib_name,
> gl_lib_version.split('.')[0]),
>    ],
>    link_with : [
> -    libloader, libloader_dri3_helper, libmesa_util, libxmlconfig,
> +    libloader, libloader_dri3_helper, libxmlconfig,
>      extra_libs_libglx,
>    ],
>    dependencies : [dep_libdrm, dep_dri2proto, dep_glproto, dep_x11,
> dep_glvnd],
> diff --git a/src/util/meson.build b/src/util/meson.build
> index a4ff0b9..c5714a7 100644
> --- a/src/util/meson.build
> +++ b/src/util/meson.build
> @@ -117,6 +117,7 @@ libxmlconfig = static_library(
>    'xmlconfig',
>    files_xmlconfig,
>    include_directories : inc_common,
> +  link_with : [libmesa_util],
>    dependencies : [dep_expat, dep_m],
>    c_args : [
>      c_msvc_compat_args, c_vis_args,
> --
> 2.7.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
On Thursday, 2018-09-06 17:38:36 +0300, Sergii Romantsov wrote:
> Building of 32bit mesa with meson causes linkage issue:
> "undefined reference to `util_get_process_name'"
> Fixed by adding link-with mesa_util for xmlconfig primary.
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107843
> Signed-off-by: Sergii Romantsov <sergii.romantsov@globallogic.com>
> ---
>  src/gbm/meson.build  | 2 +-
>  src/glx/meson.build  | 2 +-
>  src/util/meson.build | 1 +
>  3 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/src/gbm/meson.build b/src/gbm/meson.build
> index 2e9d380..6ca8b38 100644
> --- a/src/gbm/meson.build
> +++ b/src/gbm/meson.build
> @@ -51,7 +51,7 @@ libgbm = shared_library(
>    include_directories : incs_gbm,
>    c_args : [c_vis_args, args_gbm],
>    link_args : [ld_args_gc_sections],
> -  link_with : [libloader, libmesa_util, libxmlconfig],
> +  link_with : [libloader, libxmlconfig],
>    dependencies : [deps_gbm, dep_dl, dep_thread],
>    version : '1.0.0',
>    install : true,
> diff --git a/src/glx/meson.build b/src/glx/meson.build
> index dd8ba60..5a97d3e 100644
> --- a/src/glx/meson.build
> +++ b/src/glx/meson.build
> @@ -150,7 +150,7 @@ libglx = static_library(
>      '-DGL_LIB_NAME="lib@0@.so.@1@"'.format(gl_lib_name, gl_lib_version.split('.')[0]),
>    ],
>    link_with : [
> -    libloader, libloader_dri3_helper, libmesa_util, libxmlconfig,
> +    libloader, libloader_dri3_helper, libxmlconfig,
>      extra_libs_libglx,
>    ],
>    dependencies : [dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_glvnd],
> diff --git a/src/util/meson.build b/src/util/meson.build
> index a4ff0b9..c5714a7 100644
> --- a/src/util/meson.build
> +++ b/src/util/meson.build
> @@ -117,6 +117,7 @@ libxmlconfig = static_library(
>    'xmlconfig',
>    files_xmlconfig,
>    include_directories : inc_common,
> +  link_with : [libmesa_util],

This line is indeed necessary (although the [] are not), but we don't
want to remove libmesa_util from the other libs.

When you send a v2, can you please add:

Fixes: 2e1e6511f76370870b5cd "util: extract get_process_name from xmlconfig.c"
Cc: Marek Olšák <marek.olsak@amd.com>
Cc: Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>

Thanks for the patch!

>    dependencies : [dep_expat, dep_m],
>    c_args : [
>      c_msvc_compat_args, c_vis_args,
> -- 
> 2.7.4
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Hello, Eric.

 but we don't want to remove libmesa_util from the other libs


Does it mean to revert src/gbm/meson.build and src/glx/meson.build ?

On Thu, Sep 6, 2018 at 8:30 PM, Eric Engestrom <eric.engestrom@intel.com>
wrote:

> On Thursday, 2018-09-06 17:38:36 +0300, Sergii Romantsov wrote:
> > Building of 32bit mesa with meson causes linkage issue:
> > "undefined reference to `util_get_process_name'"
> > Fixed by adding link-with mesa_util for xmlconfig primary.
> >
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107843
> > Signed-off-by: Sergii Romantsov <sergii.romantsov@globallogic.com>
> > ---
> >  src/gbm/meson.build  | 2 +-
> >  src/glx/meson.build  | 2 +-
> >  src/util/meson.build | 1 +
> >  3 files changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/src/gbm/meson.build b/src/gbm/meson.build
> > index 2e9d380..6ca8b38 100644
> > --- a/src/gbm/meson.build
> > +++ b/src/gbm/meson.build
> > @@ -51,7 +51,7 @@ libgbm = shared_library(
> >    include_directories : incs_gbm,
> >    c_args : [c_vis_args, args_gbm],
> >    link_args : [ld_args_gc_sections],
> > -  link_with : [libloader, libmesa_util, libxmlconfig],
> > +  link_with : [libloader, libxmlconfig],
> >    dependencies : [deps_gbm, dep_dl, dep_thread],
> >    version : '1.0.0',
> >    install : true,
> > diff --git a/src/glx/meson.build b/src/glx/meson.build
> > index dd8ba60..5a97d3e 100644
> > --- a/src/glx/meson.build
> > +++ b/src/glx/meson.build
> > @@ -150,7 +150,7 @@ libglx = static_library(
> >      '-DGL_LIB_NAME="lib@0@.so.@1@"'.format(gl_lib_name,
> gl_lib_version.split('.')[0]),
> >    ],
> >    link_with : [
> > -    libloader, libloader_dri3_helper, libmesa_util, libxmlconfig,
> > +    libloader, libloader_dri3_helper, libxmlconfig,
> >      extra_libs_libglx,
> >    ],
> >    dependencies : [dep_libdrm, dep_dri2proto, dep_glproto, dep_x11,
> dep_glvnd],
> > diff --git a/src/util/meson.build b/src/util/meson.build
> > index a4ff0b9..c5714a7 100644
> > --- a/src/util/meson.build
> > +++ b/src/util/meson.build
> > @@ -117,6 +117,7 @@ libxmlconfig = static_library(
> >    'xmlconfig',
> >    files_xmlconfig,
> >    include_directories : inc_common,
> > +  link_with : [libmesa_util],
>
> This line is indeed necessary (although the [] are not), but we don't
> want to remove libmesa_util from the other libs.
>
> When you send a v2, can you please add:
>
> Fixes: 2e1e6511f76370870b5cd "util: extract get_process_name from
> xmlconfig.c"
> Cc: Marek Olšák <marek.olsak@amd.com>
> Cc: Dylan Baker <dylan@pnwbakers.com>
> Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
>
> Thanks for the patch!
>
> >    dependencies : [dep_expat, dep_m],
> >    c_args : [
> >      c_msvc_compat_args, c_vis_args,
> > --
> > 2.7.4
> >
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
On Friday, 2018-09-07 12:09:46 +0300, Sergii Romantsov wrote:
> Hello, Eric.
> 
>  but we don't want to remove libmesa_util from the other libs
> 
> 
> Does it mean to revert src/gbm/meson.build and src/glx/meson.build ?

Yes, precisely :)

> 
> On Thu, Sep 6, 2018 at 8:30 PM, Eric Engestrom <eric.engestrom@intel.com>
> wrote:
> 
> > On Thursday, 2018-09-06 17:38:36 +0300, Sergii Romantsov wrote:
> > > Building of 32bit mesa with meson causes linkage issue:
> > > "undefined reference to `util_get_process_name'"
> > > Fixed by adding link-with mesa_util for xmlconfig primary.
> > >
> > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107843
> > > Signed-off-by: Sergii Romantsov <sergii.romantsov@globallogic.com>
> > > ---
> > >  src/gbm/meson.build  | 2 +-
> > >  src/glx/meson.build  | 2 +-
> > >  src/util/meson.build | 1 +
> > >  3 files changed, 3 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/src/gbm/meson.build b/src/gbm/meson.build
> > > index 2e9d380..6ca8b38 100644
> > > --- a/src/gbm/meson.build
> > > +++ b/src/gbm/meson.build
> > > @@ -51,7 +51,7 @@ libgbm = shared_library(
> > >    include_directories : incs_gbm,
> > >    c_args : [c_vis_args, args_gbm],
> > >    link_args : [ld_args_gc_sections],
> > > -  link_with : [libloader, libmesa_util, libxmlconfig],
> > > +  link_with : [libloader, libxmlconfig],
> > >    dependencies : [deps_gbm, dep_dl, dep_thread],
> > >    version : '1.0.0',
> > >    install : true,
> > > diff --git a/src/glx/meson.build b/src/glx/meson.build
> > > index dd8ba60..5a97d3e 100644
> > > --- a/src/glx/meson.build
> > > +++ b/src/glx/meson.build
> > > @@ -150,7 +150,7 @@ libglx = static_library(
> > >      '-DGL_LIB_NAME="lib@0@.so.@1@"'.format(gl_lib_name,
> > gl_lib_version.split('.')[0]),
> > >    ],
> > >    link_with : [
> > > -    libloader, libloader_dri3_helper, libmesa_util, libxmlconfig,
> > > +    libloader, libloader_dri3_helper, libxmlconfig,
> > >      extra_libs_libglx,
> > >    ],
> > >    dependencies : [dep_libdrm, dep_dri2proto, dep_glproto, dep_x11,
> > dep_glvnd],
> > > diff --git a/src/util/meson.build b/src/util/meson.build
> > > index a4ff0b9..c5714a7 100644
> > > --- a/src/util/meson.build
> > > +++ b/src/util/meson.build
> > > @@ -117,6 +117,7 @@ libxmlconfig = static_library(
> > >    'xmlconfig',
> > >    files_xmlconfig,
> > >    include_directories : inc_common,
> > > +  link_with : [libmesa_util],
> >
> > This line is indeed necessary (although the [] are not), but we don't
> > want to remove libmesa_util from the other libs.
> >
> > When you send a v2, can you please add:
> >
> > Fixes: 2e1e6511f76370870b5cd "util: extract get_process_name from
> > xmlconfig.c"
> > Cc: Marek Olšák <marek.olsak@amd.com>
> > Cc: Dylan Baker <dylan@pnwbakers.com>
> > Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
> >
> > Thanks for the patch!
> >
> > >    dependencies : [dep_expat, dep_m],
> > >    c_args : [
> > >      c_msvc_compat_args, c_vis_args,
> > > --
> > > 2.7.4
> > >
> > > _______________________________________________
> > > mesa-dev mailing list
> > > mesa-dev@lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
> >
> 
> 
> 
> -- 
> Sergii Romantsov
> GlobalLogic Inc.
> www.globallogic.com