Hi Sean,
On Thu, Apr 30, 2020 at 4:48 PM Sean Young <sean@xxxxxxxx> wrote:
>
> On Wed, Apr 29, 2020 at 12:16:39PM -0300, Ariel D'Alessandro wrote:
> > Supports building libraries and tools found in contrib/, lib/ and
> > utils/ directories, along with the implemented gettext translations.
> >
> > Co-developed-by: Ezequiel Garcia <ezequiel@xxxxxxxxxxxxx>
> > Signed-off-by: Ezequiel Garcia <ezequiel@xxxxxxxxxxxxx>
> > Signed-off-by: Ariel D'Alessandro <ariel@xxxxxxxxxxxxxxxxxxxx>
> > ---
> > .gitignore | 1 +
>
> ...
>
> > +# Detect system gconv directory
> > +gconvsysdir = get_option('gconvsysdir')
> > +
> > +# Generic check: works with most distributions
> > +gconv_dirs_generic = [
> > + '/lib',
> > + '/lib64',
>
> On Fedora 32 (just released yesterday), I have to /lib64 before /lib in this
> list. Otherwise, dep_jis becomes /lib/gconv/libJIS.so, which is the 32
> bit version. It should be /lib64/gconv/libJIS.so
Makes sense. I'll keep the directories order as it is in the configure.ac file.
>
> > + '/usr/lib',
> > + '/usr/lib64',
> > + '/usr/local/lib',
> > + '/usr/local/lib64',
> > +]
> > +
> > +if gconvsysdir == ''
> > + foreach dir : gconv_dirs_generic
> > + dir = dir / 'gconv'
> > + if fs.is_dir(dir)
> > + gconvsysdir = dir
> > + break
> > + endif
> > + endforeach
> > +endif
> > +
> > +# Debian/Ubuntu-specific check: should be aligned with the debian package
> > +gconv_dirs_debian = [
> > + 'alphaev67-linux-gnu',
> > + 'arm-linux-gnueabi',
> > + 'arm-linux-gnueabihf',
> > + 'i686-kfreebsd-gnu',
> > + 'i686-linux-gnu',
> > + 'mips-linux-gnu',
> > + 'mips64-linux-gnuabi64',
> > + 'mips64-linux-gnuabin32',
> > + 'mips64el-linux-gnuabi64',
> > + 'mips64el-linux-gnuabin32',
> > + 'mipsel-linux-gnu',
> > + 'mipsisa32r6-linux-gnu',
> > + 'mipsisa32r6el-linux-gnu',
> > + 'mipsisa64r6-linux-gnuabi64',
> > + 'mipsisa64r6-linux-gnuabin32',
> > + 'mipsisa64r6el-linux-gnuabi64',
> > + 'mipsisa64r6el-linux-gnuabin32',
> > + 'powerpc-linux-gnu',
> > + 'powerpc64-linux-gnu',
> > + 's390-linux-gnu',
> > + 'sparc64-linux-gnu',
> > + 'sparcv9-linux-gnu',
> > + 'x86_64-linux-gnu',
> > + 'x86_64-linux-gnux32',
> > +]
> > +if gconvsysdir == ''
> > + foreach dir : gconv_dirs_debian
> > + dir = '/usr' / 'lib' / dir / 'gconv'
> > + if fs.is_dir(dir)
> > + gconv_dir = dir
> > + break
> > + endif
> > + endforeach
> > +endif
> > +
> > +dep_jis = cc.find_library('JIS', required : get_option('gconv'), dirs : gconvsysdir)
> > +dep_jisx0213 = cc.find_library('JISX0213', required : get_option('gconv'), dirs : gconvsysdir)
> > +
> > +dep_jpeg = dependency('libjpeg', required : get_option('jpeg'))
> > +if dep_jpeg.found()
> > + dep_jpeg_priv_libs = '-ljpeg'
> > +endif
>
>
> Looks great otherwise, thank you for doing this!
>
>
> Sean
