Re: libradius patches (fwd)

On Tue, Apr 13, 2004 at 12:37:15PM +0200, Michael Bretterklieber wrote:
> Hi Ruslan,
> 
> Ruslan Ermilov schrieb:
> >
> >I don't have a test environment for Radius, but the Makefile.inc1
> >patch is wrong, and shouldn't be committed as is.  If a different
> >library build order is necessary for prebuilt libs (as should be
> >verified by running the src/tools/make_libdeps.sh script with the
> >patches), then only some modifications should be made to the __L
> >lines in Makefile.inc1, again as reported by this tool.
> >
> after modifying make_libdeps.sh:
> --- make_libdeps.sh_orig        Tue Apr 13 10:15:19 2004
> +++ make_libdeps.sh     Tue Apr 13 10:15:49 2004
> _at__at_ -52,6 +52,7 _at__at_
>      -e's;-l(asn1|gssapi|krb5|roken)!;kerberos5/lib/lib\1;g'
>      -e's;-l(crypto|ssh)!;secure/lib/lib\1;g'
>      -e's;-l([^!]+)!;lib/lib\1;g'
> +    -e's;-lssl!;secure/lib/libssl;g'
>  "
> 
>  # Generate interdependencies between libraries.
> 
> it prints out:
> ...
> List of interdependencies:
> 
> lib/libopie lib/libtacplus: lib/libmd
> lib/libradius: lib/libssl
> lib/libypclnt: lib/librpcsvc
> secure/lib/libssh: secure/lib/libcrypto lib/libz
> 
I've committed your change to make_libdeps.sh, slightly different
but functionally equivalent.  Thanks!

> how does that patch look for you, better?
> 
Yes, now it looks correct (except for adding an extraneous
empty line at the end).

> --- Makefile.inc1.orig  Tue Mar 23 14:47:17 2004
> +++ Makefile.inc1       Tue Apr 13 10:57:59 2004
[...]
> _at__at_ -833,6 +834,11 _at__at_
>  .endif
>  _generic_libs+=        secure/lib
>  .endif
> +
> +.if defined(NOCRYPT) || defined(NO_OPENSSL)
> +lib/libradius__L: lib/libmd__L
> +.endif
> +
> 
>  _generic_libs+=        usr.bin/lex/lib
> 
> I made successfully two complete buildworld's with and without NO_OPENSSL.
> 
Good.


Cheers,
-- 
Ruslan Ermilov
ru_at_FreeBSD.org
FreeBSD committer