Date: Tue, 13 Apr 2004 14:17:19 +0300 From: Ruslan Ermilov <ru@freebsd.org> To: Michael Bretterklieber <mbretter@a-quadrat.at> Cc: current@freebsd.org Subject: Re: libradius patches (fwd) Message-ID: <20040413111719.GA43932@ip.net.ua> In-Reply-To: <407BC2DB.6000407@a-quadrat.at> References: <Pine.BSF.4.21.0404121849370.9723-110000@InterJet.elischer.org> <20040413075342.GF35262@ip.net.ua> <407BC2DB.6000407@a-quadrat.at>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] 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 > @@ -52,6 +52,7 @@ > -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 [...] > @@ -833,6 +834,11 @@ > .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@FreeBSD.org FreeBSD committer [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFAe8w/Ukv4P6juNwoRAsEOAJ9HdxOjrfhkAdkBZjx9rwXlEAEs1ACff0KY tgjK2za52JTpdkFSy5Xzx/U= =NbQj -----END PGP SIGNATURE-----help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040413111719.GA43932>