[PATCH] waf.bbclass: explicitly pass libdir

[PATCH] waf.bbclass: explicitly pass libdir

[Stefan Agner]

From: Stefan Agner <stefan.agner@toradex.com>

On some build hosts distros (e.g. Fedora 26) waf tries to be
smart about libdir detection and defaults to [EXEC_PREFIX/lib64].
This obviously is not what we want for 32-bit targets and usually
fails in the do_package phase:
  WARNING: gstreamer1.0-plugins-imx-0.13.0-r0 do_package: QA Issue: gstreamer1.0-plugins-imx: Files/directories were installed but not shipped in any package:
    /usr/lib64/libgstimxcommon.so.0

Explicitly pass libdir to waf reliably resolves the issue.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
---
 meta/classes/waf.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/waf.bbclass b/meta/classes/waf.bbclass
index c4698e910a..43b3f098ac 100644
--- a/meta/classes/waf.bbclass
+++ b/meta/classes/waf.bbclass
@@ -26,7 +26,7 @@ def get_waf_parallel_make(d):
     return ""
 
 waf_do_configure() {
-	${S}/waf configure --prefix=${prefix} ${EXTRA_OECONF}
+	${S}/waf configure --prefix=${prefix} --libdir=${libdir} ${EXTRA_OECONF}
 }
 
 waf_do_compile()  {
-- 
2.13.6

Re: [PATCH] waf.bbclass: explicitly pass libdir

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 990 bytes --]

On 11 December 2017 at 13:57, Stefan Agner <stefan@agner.ch> wrote:

> From: Stefan Agner <stefan.agner@toradex.com>
>
> On some build hosts distros (e.g. Fedora 26) waf tries to be
> smart about libdir detection and defaults to [EXEC_PREFIX/lib64].
> This obviously is not what we want for 32-bit targets and usually
> fails in the do_package phase:
>   WARNING: gstreamer1.0-plugins-imx-0.13.0-r0 do_package: QA Issue:
> gstreamer1.0-plugins-imx: Files/directories were installed but not shipped
> in any package:
>     /usr/lib64/libgstimxcommon.so.0
>
> Explicitly pass libdir to waf reliably resolves the issue.
>

What happens if the wscript doesn't recognise --libdir, does it silently
ignore it or throw an error?

If waf supports prefix and libdir and doesn't error on unknown options,
does it also support datadir/sysconfdir and so on?  We should pass as much
as possible.  The gnu_dirs module suggests yes, so you could copy what
autotools passes.

Ross

[-- Attachment #2: Type: text/html, Size: 1422 bytes --]

Re: [PATCH] waf.bbclass: explicitly pass libdir

[Stefan Agner]

On 2017-12-11 15:01, Burton, Ross wrote:

> On 11 December 2017 at 13:57, Stefan Agner <stefan@agner.ch> wrote:
> 
>> From: Stefan Agner <stefan.agner@toradex.com>
>> 
>> On some build hosts distros (e.g. Fedora 26) waf tries to be
>> smart about libdir detection and defaults to [EXEC_PREFIX/lib64].
>> This obviously is not what we want for 32-bit targets and usually
>> fails in the do_package phase:
>> WARNING: gstreamer1.0-plugins-imx-0.13.0-r0 do_package: QA Issue: gstreamer1.0-plugins-imx: Files/directories were installed but not shipped in any package:
>> /usr/lib64/libgstimxcommon.so.0
>> 
>> Explicitly pass libdir to waf reliably resolves the issue.
> 
> What happens if the wscript doesn't recognise --libdir, does it silently ignore it or throw an error? 

Hm, isn't this a "base" option which is always supported?

> 
> If waf supports prefix and libdir and doesn't error on unknown options, does it also support datadir/sysconfdir and so on?  We should pass as much as possible.  The gnu_dirs module suggests yes, so you could copy what autotools passes. 
> 

There are a bunch of others. But most seem to derive from PREFIX, which
we set...

  Installation prefix:                                                  
                                                                   
    By default, "waf install" will put the files in "/usr/local/bin",
"/usr/local/lib" etc. An installation prefix other than               
    "/usr/local" can be given using "--prefix", for example
"--prefix=$HOME"                                                        
       
                                                                        
                                                                   
    --prefix=PREFIX     installation prefix [default: '/usr/local/']  
    --destdir=DESTDIR   installation root [default: '']               
    --exec-prefix=EXEC_PREFIX      
                        installation prefix for binaries [PREFIX] 

  Installation directories:        
    --bindir=BINDIR     user commands [EXEC_PREFIX/bin]               
    --sbindir=SBINDIR   system binaries [EXEC_PREFIX/sbin]            
    --libexecdir=LIBEXECDIR        
                        program-specific binaries [EXEC_PREFIX/libexec] 
                                                                   
    --sysconfdir=SYSCONFDIR        
                        host-specific configuration [PREFIX/etc]      
    --sharedstatedir=SHAREDSTATEDIR                                   
                        architecture-independent variable data
[PREFIX/com]                                                            
    
    --localstatedir=LOCALSTATEDIR  
                        variable data [PREFIX/var]                    
    --libdir=LIBDIR     object code libraries [EXEC_PREFIX/lib64]     
    --includedir=INCLUDEDIR        
                        header files [PREFIX/include]                 
    --oldincludedir=OLDINCLUDEDIR  
                        header files for non-GCC compilers
[/usr/include]                                                          
        
    --datarootdir=DATAROOTDIR      
                        architecture-independent data root
[PREFIX/share]                                                          
        
    --datadir=DATADIR   architecture-independent data [DATAROOTDIR]   
    --infodir=INFODIR   GNU "info" documentation [DATAROOTDIR/info]   
    --localedir=LOCALEDIR          
                        locale-dependent data [DATAROOTDIR/locale]    
    --mandir=MANDIR     manual pages [DATAROOTDIR/man]                
    --docdir=DOCDIR     documentation root [DATAROOTDIR/doc/PACKAGE]  
    --htmldir=HTMLDIR   HTML documentation [DOCDIR]                   
    --dvidir=DVIDIR     DVI documentation [DOCDIR]                    
    --pdfdir=PDFDIR     PDF documentation [DOCDIR]                    
    --psdir=PSDIR       PostScript documentation [DOCDIR]   

--
Stefan

Re: [PATCH] waf.bbclass: explicitly pass libdir

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 2469 bytes --]

On 11 December 2017 at 14:16, Stefan Agner <stefan@agner.ch> wrote:

> Hm, isn't this a "base" option which is always supported?


No idea. :)


> There are a bunch of others. But most seem to derive from PREFIX, which
> we set...
>
>   Installation prefix:
>
>     By default, "waf install" will put the files in "/usr/local/bin",
> "/usr/local/lib" etc. An installation prefix other than
>     "/usr/local" can be given using "--prefix", for example
> "--prefix=$HOME"
>
>
>
>     --prefix=PREFIX     installation prefix [default: '/usr/local/']
>     --destdir=DESTDIR   installation root [default: '']
>     --exec-prefix=EXEC_PREFIX
>                         installation prefix for binaries [PREFIX]
>
>   Installation directories:
>     --bindir=BINDIR     user commands [EXEC_PREFIX/bin]
>     --sbindir=SBINDIR   system binaries [EXEC_PREFIX/sbin]
>     --libexecdir=LIBEXECDIR
>                         program-specific binaries [EXEC_PREFIX/libexec]
>
>     --sysconfdir=SYSCONFDIR
>                         host-specific configuration [PREFIX/etc]
>     --sharedstatedir=SHAREDSTATEDIR
>                         architecture-independent variable data
> [PREFIX/com]
>
>     --localstatedir=LOCALSTATEDIR
>                         variable data [PREFIX/var]
>     --libdir=LIBDIR     object code libraries [EXEC_PREFIX/lib64]
>     --includedir=INCLUDEDIR
>                         header files [PREFIX/include]
>     --oldincludedir=OLDINCLUDEDIR
>                         header files for non-GCC compilers
> [/usr/include]
>
>     --datarootdir=DATAROOTDIR
>                         architecture-independent data root
> [PREFIX/share]
>
>     --datadir=DATADIR   architecture-independent data [DATAROOTDIR]
>     --infodir=INFODIR   GNU "info" documentation [DATAROOTDIR/info]
>     --localedir=LOCALEDIR
>                         locale-dependent data [DATAROOTDIR/locale]
>     --mandir=MANDIR     manual pages [DATAROOTDIR/man]
>     --docdir=DOCDIR     documentation root [DATAROOTDIR/doc/PACKAGE]
>     --htmldir=HTMLDIR   HTML documentation [DOCDIR]
>     --dvidir=DVIDIR     DVI documentation [DOCDIR]
>     --pdfdir=PDFDIR     PDF documentation [DOCDIR]
>     --psdir=PSDIR       PostScript documentation [DOCDIR]
>

But we do allow distros to override those, so passing the ones that we can
is good.  bitbake.conf has the canonical list of prefix variables that we
expose.

Ross

[-- Attachment #2: Type: text/html, Size: 3347 bytes --]

Re: [PATCH] waf.bbclass: explicitly pass libdir

[Joshua Watt]

[-- Attachment #1: Type: text/plain, Size: 3154 bytes --]

On Mon, 2017-12-11 at 14:58 +0000, Burton, Ross wrote:
> On 11 December 2017 at 14:16, Stefan Agner <stefan@agner.ch> wrote:
> > Hm, isn't this a "base" option which is always supported?
> 
> No idea. :)
>  
> > There are a bunch of others. But most seem to derive from PREFIX,
> > which
> > 
> > we set...
> > 
> > 
> > 
> >   Installation prefix:
> > 
> > 
> > 
> >     By default, "waf install" will put the files in
> > "/usr/local/bin",
> > 
> > "/usr/local/lib" etc. An installation prefix other than
> > 
> >     "/usr/local" can be given using "--prefix", for example
> > 
> > "--prefix=$HOME"
> > 
> > 
> > 
> > 
> > 
> > 
> > 
> >     --prefix=PREFIX     installation prefix [default:
> > '/usr/local/']
> > 
> >     --destdir=DESTDIR   installation root [default: '']
> > 
> >     --exec-prefix=EXEC_PREFIX
> > 
> >                         installation prefix for binaries [PREFIX]
> > 
> > 
> > 
> >   Installation directories:
> > 
> >     --bindir=BINDIR     user commands [EXEC_PREFIX/bin]
> > 
> >     --sbindir=SBINDIR   system binaries [EXEC_PREFIX/sbin]
> > 
> >     --libexecdir=LIBEXECDIR
> > 
> >                         program-specific binaries
> > [EXEC_PREFIX/libexec]
> > 
> > 
> > 
> >     --sysconfdir=SYSCONFDIR
> > 
> >                         host-specific configuration [PREFIX/etc]
> > 
> >     --sharedstatedir=SHAREDSTATEDIR
> > 
> >                         architecture-independent variable data
> > 
> > [PREFIX/com]
> > 
> > 
> > 
> >     --localstatedir=LOCALSTATEDIR
> > 
> >                         variable data [PREFIX/var]
> > 
> >     --libdir=LIBDIR     object code libraries [EXEC_PREFIX/lib64]
> > 
> >     --includedir=INCLUDEDIR
> > 
> >                         header files [PREFIX/include]
> > 
> >     --oldincludedir=OLDINCLUDEDIR
> > 
> >                         header files for non-GCC compilers
> > 
> > [/usr/include]
> > 
> > 
> > 
> >     --datarootdir=DATAROOTDIR
> > 
> >                         architecture-independent data root
> > 
> > [PREFIX/share]
> > 
> > 
> > 
> >     --datadir=DATADIR   architecture-independent data [DATAROOTDIR]
> > 
> >     --infodir=INFODIR   GNU "info" documentation [DATAROOTDIR/info]
> > 
> >     --localedir=LOCALEDIR
> > 
> >                         locale-dependent data [DATAROOTDIR/locale]
> > 
> >     --mandir=MANDIR     manual pages [DATAROOTDIR/man]
> > 
> >     --docdir=DOCDIR     documentation root
> > [DATAROOTDIR/doc/PACKAGE]
> > 
> >     --htmldir=HTMLDIR   HTML documentation [DOCDIR]
> > 
> >     --dvidir=DVIDIR     DVI documentation [DOCDIR]
> > 
> >     --pdfdir=PDFDIR     PDF documentation [DOCDIR]
> > 
> >     --psdir=PSDIR       PostScript documentation [DOCDIR]
> 
> But we do allow distros to override those, so passing the on

Vanilla waf only supports --prefix, --libdir, and --bindir. Anything
else is a result of loading the gnu_dirs tool, which not all projects
are required to do.
> es that we can is good.  bitbake.conf has the canonical list of
> prefix variables that we expose.
> 
> Ross 
> 

[-- Attachment #2: Type: text/html, Size: 4648 bytes --]

Re: [PATCH] waf.bbclass: explicitly pass libdir

[Joshua Watt]

[-- Attachment #1: Type: text/plain, Size: 3728 bytes --]

On Mon, 2017-12-11 at 09:32 -0600, Joshua Watt wrote:
> On Mon, 2017-12-11 at 14:58 +0000, Burton, Ross wrote:
> > On 11 December 2017 at 14:16, Stefan Agner <stefan@agner.ch> wrote:
> > > Hm, isn't this a "base" option which is always supported?
> > 
> > No idea. :)
> >  
> > > There are a bunch of others. But most seem to derive from PREFIX,
> > > which
> > > 
> > > we set...
> > > 
> > > 
> > > 
> > >   Installation prefix:
> > > 
> > > 
> > > 
> > >     By default, "waf install" will put the files in
> > > "/usr/local/bin",
> > > 
> > > "/usr/local/lib" etc. An installation prefix other than
> > > 
> > >     "/usr/local" can be given using "--prefix", for example
> > > 
> > > "--prefix=$HOME"
> > > 
> > > 
> > > 
> > > 
> > > 
> > > 
> > > 
> > >     --prefix=PREFIX     installation prefix [default:
> > > '/usr/local/']
> > > 
> > >     --destdir=DESTDIR   installation root [default: '']
> > > 
> > >     --exec-prefix=EXEC_PREFIX
> > > 
> > >                         installation prefix for binaries [PREFIX]
> > > 
> > > 
> > > 
> > >   Installation directories:
> > > 
> > >     --bindir=BINDIR     user commands [EXEC_PREFIX/bin]
> > > 
> > >     --sbindir=SBINDIR   system binaries [EXEC_PREFIX/sbin]
> > > 
> > >     --libexecdir=LIBEXECDIR
> > > 
> > >                         program-specific binaries
> > > [EXEC_PREFIX/libexec]
> > > 
> > > 
> > > 
> > >     --sysconfdir=SYSCONFDIR
> > > 
> > >                         host-specific configuration [PREFIX/etc]
> > > 
> > >     --sharedstatedir=SHAREDSTATEDIR
> > > 
> > >                         architecture-independent variable data
> > > 
> > > [PREFIX/com]
> > > 
> > > 
> > > 
> > >     --localstatedir=LOCALSTATEDIR
> > > 
> > >                         variable data [PREFIX/var]
> > > 
> > >     --libdir=LIBDIR     object code libraries [EXEC_PREFIX/lib64]
> > > 
> > >     --includedir=INCLUDEDIR
> > > 
> > >                         header files [PREFIX/include]
> > > 
> > >     --oldincludedir=OLDINCLUDEDIR
> > > 
> > >                         header files for non-GCC compilers
> > > 
> > > [/usr/include]
> > > 
> > > 
> > > 
> > >     --datarootdir=DATAROOTDIR
> > > 
> > >                         architecture-independent data root
> > > 
> > > [PREFIX/share]
> > > 
> > > 
> > > 
> > >     --datadir=DATADIR   architecture-independent data
> > > [DATAROOTDIR]
> > > 
> > >     --infodir=INFODIR   GNU "info" documentation
> > > [DATAROOTDIR/info]
> > > 
> > >     --localedir=LOCALEDIR
> > > 
> > >                         locale-dependent data
> > > [DATAROOTDIR/locale]
> > > 
> > >     --mandir=MANDIR     manual pages [DATAROOTDIR/man]
> > > 
> > >     --docdir=DOCDIR     documentation root
> > > [DATAROOTDIR/doc/PACKAGE]
> > > 
> > >     --htmldir=HTMLDIR   HTML documentation [DOCDIR]
> > > 
> > >     --dvidir=DVIDIR     DVI documentation [DOCDIR]
> > > 
> > >     --pdfdir=PDFDIR     PDF documentation [DOCDIR]
> > > 
> > >     --psdir=PSDIR       PostScript documentation [DOCDIR]
> > 
> > But we do allow distros to override those, so passing the on
> 
> Vanilla waf only supports --prefix, --libdir, and --bindir. Anything
> else is a result of loading the gnu_dirs tool, which not all projects
> are required to do.

Sorry, hit send too soo: waf (at least version 2.0) also errors out on
unknown options. I think the three I listed are the only ones we can do
generically. There might be some way to easily adding the rest if you
know waf is loading gnu_dirs
> > es that we can is good.  bitbake.conf has the canonical list of
> > prefix variables that we expose.
> > 
> > Ross 
> > 

[-- Attachment #2: Type: text/html, Size: 5216 bytes --]

Re: [PATCH] waf.bbclass: explicitly pass libdir

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 662 bytes --]

On 11 December 2017 at 15:37, Joshua Watt <jpewhacker@gmail.com> wrote:

> Vanilla waf only supports --prefix, --libdir, and --bindir. Anything else
> is a result of loading the gnu_dirs tool, which not all projects are
> required to do.
>
>
> Sorry, hit send too soo: waf (at least version 2.0) also errors out on
> unknown options. I think the three I listed are the only ones we can do
> generically. There might be some way to easily adding the rest if you know
> waf is loading gnu_dirs
>

One option would be for waf.bbclass to check if WAF_USES_GNU_DIRS is set
(defaulting to 0) and pass the full set of path options automatically.

Ross

[-- Attachment #2: Type: text/html, Size: 1151 bytes --]

Re: [PATCH] waf.bbclass: explicitly pass libdir

[Otavio Salvador]

On Mon, Dec 11, 2017 at 3:09 PM, Burton, Ross <ross.burton@intel.com> wrote:
> On 11 December 2017 at 15:37, Joshua Watt <jpewhacker@gmail.com> wrote:
>>
>> Vanilla waf only supports --prefix, --libdir, and --bindir. Anything else
>> is a result of loading the gnu_dirs tool, which not all projects are
>> required to do.
>>
>>
>> Sorry, hit send too soo: waf (at least version 2.0) also errors out on
>> unknown options. I think the three I listed are the only ones we can do
>> generically. There might be some way to easily adding the rest if you know
>> waf is loading gnu_dirs
>
>
> One option would be for waf.bbclass to check if WAF_USES_GNU_DIRS is set
> (defaulting to 0) and pass the full set of path options automatically.

Possible. But passing the standard ones solve 99% of the issues.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH] waf.bbclass: explicitly pass libdir

[Stefan Agner]

On 2017-12-11 18:15, Otavio Salvador wrote:
> On Mon, Dec 11, 2017 at 3:09 PM, Burton, Ross <ross.burton@intel.com> wrote:
>> On 11 December 2017 at 15:37, Joshua Watt <jpewhacker@gmail.com> wrote:
>>>
>>> Vanilla waf only supports --prefix, --libdir, and --bindir. Anything else
>>> is a result of loading the gnu_dirs tool, which not all projects are
>>> required to do.
>>>
>>>
>>> Sorry, hit send too soo: waf (at least version 2.0) also errors out on
>>> unknown options. I think the three I listed are the only ones we can do
>>> generically. There might be some way to easily adding the rest if you know
>>> waf is loading gnu_dirs
>>
>>
>> One option would be for waf.bbclass to check if WAF_USES_GNU_DIRS is set
>> (defaulting to 0) and pass the full set of path options automatically.
> 
> Possible. But passing the standard ones solve 99% of the issues.
> 

I am with Otavio here. Also, adding the standard ones and adding the
additional GNU_DIRS would best be done in two independent patches
anyway. For now I'd rather prefer to only add the standard ones.

--
Stefan

Re: [PATCH] waf.bbclass: explicitly pass libdir

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 1281 bytes --]

On 12 December 2017 at 07:48, Stefan Agner <stefan@agner.ch> wrote:

> On 2017-12-11 18:15, Otavio Salvador wrote:
> > On Mon, Dec 11, 2017 at 3:09 PM, Burton, Ross <ross.burton@intel.com>
> wrote:
> >> On 11 December 2017 at 15:37, Joshua Watt <jpewhacker@gmail.com> wrote:
> >>>
> >>> Vanilla waf only supports --prefix, --libdir, and --bindir. Anything
> else
> >>> is a result of loading the gnu_dirs tool, which not all projects are
> >>> required to do.
> >>>
> >>>
> >>> Sorry, hit send too soo: waf (at least version 2.0) also errors out on
> >>> unknown options. I think the three I listed are the only ones we can do
> >>> generically. There might be some way to easily adding the rest if you
> know
> >>> waf is loading gnu_dirs
> >>
> >>
> >> One option would be for waf.bbclass to check if WAF_USES_GNU_DIRS is set
> >> (defaulting to 0) and pass the full set of path options automatically.
> >
> > Possible. But passing the standard ones solve 99% of the issues.
> >
>
> I am with Otavio here. Also, adding the standard ones and adding the
> additional GNU_DIRS would best be done in two independent patches
> anyway. For now I'd rather prefer to only add the standard ones.
>

Fine by me.  Will there be a v2 adding --bindir?

Ross

[-- Attachment #2: Type: text/html, Size: 1900 bytes --]

Re: [PATCH] waf.bbclass: explicitly pass libdir

[Stefan Agner]

On 2017-12-12 11:58, Burton, Ross wrote:

> On 12 December 2017 at 07:48, Stefan Agner <stefan@agner.ch> wrote:
> 
>> On 2017-12-11 18:15, Otavio Salvador wrote:
>>> On Mon, Dec 11, 2017 at 3:09 PM, Burton, Ross <ross.burton@intel.com> wrote:
>>>> On 11 December 2017 at 15:37, Joshua Watt <jpewhacker@gmail.com> wrote:
>>>>> 
>>>>> Vanilla waf only supports --prefix, --libdir, and --bindir. Anything else
>>>>> is a result of loading the gnu_dirs tool, which not all projects are
>>>>> required to do.
>>>>> 
>>>>> 
>>>>> Sorry, hit send too soo: waf (at least version 2.0) also errors out on
>>>>> unknown options. I think the three I listed are the only ones we can do
>>>>> generically. There might be some way to easily adding the rest if you know
>>>>> waf is loading gnu_dirs
>>>> 
>>>> 
>>>> One option would be for waf.bbclass to check if WAF_USES_GNU_DIRS is set
>>>> (defaulting to 0) and pass the full set of path options automatically.
>>> 
>>> Possible. But passing the standard ones solve 99% of the issues.
>>> 
>> 
>> I am with Otavio here. Also, adding the standard ones and adding the
>> additional GNU_DIRS would best be done in two independent patches
>> anyway. For now I'd rather prefer to only add the standard ones.
> 
> Fine by me.  Will there be a v2 adding --bindir? 
> 

Yes, will send soon. 

-- 
Stefan