← Back to team overview

maria-developers team mailing list archive

Re: [Commits] 370ab48: MDEV-9209 - [PATCH] scripts: Do not prepend the prefix to absolute paths

 

Hi, Sergey!

On Dec 22, Sergey Vojtovich wrote:
> > > diff --git a/support-files/mariadb.pc.in b/support-files/mariadb.pc.in
> > > index bc84a5c..0605d86 100644
> > > --- a/support-files/mariadb.pc.in
> > > +++ b/support-files/mariadb.pc.in
> > > @@ -1,18 +1,18 @@
> > >  # these four variables are present in almost every .pc file
> > >  prefix=@CMAKE_INSTALL_PREFIX@
> > >  exec_prefix=${prefix}
> > > -libdir=${prefix}/@INSTALL_LIBDIR@
> > > -includedir=${prefix}/@INSTALL_INCLUDEDIR@
> > > +libdir=@INSTALL_LIBDIRABS@
> > > +includedir=@INSTALL_INCLUDEDIRABS@
> > 
> > This is, strictly speaking, incorrect. In the old version one can change
> > prefix to any other value and all other paths will auto-adjust. See:
> > 
> > $ pkg-config --libs openrc 
> > -L/lib64 -lrc 
> > $ pkg-config --libs openrc --define-variable=prefix=/opt
> > -L/opt/lib64 -lrc 
> Nice, I didn't know it's useful. I reverted all changes to mariadb.pc.in.
> I assume this patch is ok to push now: https://github.com/MariaDB/server/commit/d464a47d0cfaf8486444edfa78180167d9f6b73a

Well, strictly speaking, the correct fix for mariadb.pc.in should be to
use, like, ${prefix}/@INSTALL_LIBDIR@ for relative paths and
@INSTALL_LIBDIRABS@ for absolute paths.

But if you'd like, it can go as a separate issue.

Regards,
Sergei
Chief Architect MariaDB
and security@xxxxxxxxxxx
-- 
Vote for my Percona Live 2016 talks:
https://www.percona.com/live/data-performance-conference-2016/sessions/mariadb-connectors-fast-and-smart-new-protocol-optimizations#community-voting
https://www.percona.com/live/data-performance-conference-2016/sessions/mariadb-101-security-validation-authentication-encryption#community-voting


References