hello
Excerpts from maximilian attems's message of Sat Mar 03 21:09:05 +0100 2012:
> hello,
> belows patch does not apply to current git,
> probably mangled by mail client, did you use git repo?
>
> > --- a/hook-functions 2011-08-04 15:50:12.000000000 +0200
> > +++ b/hook-functions 2012-02-13 16:00:41.000000000 +0100
> > @@ -126,7 +126,7 @@
> > cp -pL "${src}" "${DESTDIR}/${target}"
> >
> > # Copy the dependant libraries
> > - for x in $(ldd ${src} 2>/dev/null | sed -e '
> > + for x in $(ldd "${src}" 2>/dev/null | sed -e '
> > /\//!d;
> > /linux-gate/d;
> > /=>/ {s/.*=>[[:blank:]]*\([^[:blank:]]*\).*/\1/};
> looks good.
> > @@ -136,6 +136,7 @@
> > # We assume that all HWCAP libraries will be in tls,
> > # sse2, vfp or neon.
> > nonoptlib=$(echo "${x}" | sed -e 's#/lib/\(tls\|i686\|sse2\|neon\|vfp\).*/\(lib.*\)#/lib/\2#')
> > + nonoptlib=$(echo "${nonoptlib}" | sed -e 's#-linux-gnu/\(tls\|i686\|sse2\|neon\|vfp\).*/\(lib.*\)#-linux-gnu/\2#')
> this looks wrong,
> untested codechange of ${x} to ${nonoptlib}
This is tested codechange.
Since the value is first filtered from x to nonoptlib next pattern
filters nonoptlib to nonoptlib again.
It could be done with one sed invocation but then the line would be very
long and the changeset way more obscure.
> >
> > if [ -e "${nonoptlib}" ]; then
> > x="${nonoptlib}"
> >
>
> care to resent?
>
> In principle first I was unsure to just use the multi-arch path,
> but as we depend on a new klibc from testing..
>
This was only a heuristic from the very start, and this patch is an
update to the heuristic which makes it work with multiarch.
The second hunk does not apply because there is a new pattern which
also matches subdirectories so this should handle multiarch now without
this second part.
Attaching updated patch.
Thanks
Michal
Attachment:
quote-src.patch
Description: Binary data