From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yann E. MORIN Date: Wed, 22 Apr 2015 22:52:47 +0200 Subject: [Buildroot] [PATCHv4] toolchain: fix installing gconv libs with multi-arch toolchain In-Reply-To: <20150422224832.49055e84@free-electrons.com> References: <1429635352-14756-1-git-send-email-yann.morin.1998@free.fr> <20150422224832.49055e84@free-electrons.com> Message-ID: <20150422205247.GC4069@free.fr> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Thomas, All, On 2015-04-22 22:48 +0200, Thomas Petazzoni spake thusly: > On Tue, 21 Apr 2015 18:55:52 +0200, Yann E. MORIN wrote: > > For a multi-arch toolchain, gconv modules are in a sub-directory named > > after the machine gcc targets. This is the case, for example, for the > > Linaro ARM 2014.09 toolchain, which has the gconv modules in (relative > > to the sysroot): > > /usr/lib/arm-linux-gnueabihf/gconv > > > > while the Sourcery CodeBench ARM 2014.05 (non-multi-arch) has them in: > > /usr/lib/gconv > > > > So, to catter for both cases, search both paths. We want to favour the > > machine-specific gconv modules over potentially existing "generic" ones, > > so we first search that (if it exists) and fallback to looking in the > > generic location. > > > > Signed-off-by: "Yann E. MORIN" > > > > --- > > changes v3 -> v4: > > - nothing, just rebased on top of master > > I've applied, even though I'm not terribly happy with the huge amount > of complex shell code being added. This gconv stuff is already calling > a shell script to recreate the gconv-modules file. Maybe we should just > move all this logic to a separate shell script, in which we could use > functions and so on? Yes, that's a good idea. I've put it on my ever-growing TODO-list. ;-) > I've tried to think a bit about writing all of this in make, but it > isn't trivial at all. Nah, it's not. I tried a bit too, but promptly aborted, to keep using shell stuff. Thanks! :-) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'