libradius patches (fwd)

[Michael Bretterklieber]

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

how does that patch look for you, better?
--- Makefile.inc1.orig  Tue Mar 23 14:47:17 2004
+++ Makefile.inc1       Tue Apr 13 10:57:59 2004
@@ -818,7 +818,7 @@
                 lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \
                 lib/libz lib/msun

-lib/libopie__L lib/libradius__L lib/libtacplus__L: lib/libmd__L
+lib/libopie__L lib/libtacplus__L: lib/libmd__L
  lib/libypclnt__L: lib/librpcsvc__L

  _generic_libs+=        lib
@@ -826,6 +826,7 @@
  .if !defined(NOCRYPT)
  .if !defined(NO_OPENSSL)
  _prebuild_libs+=       secure/lib/libcrypto secure/lib/libssl
+lib/libradius__L: secure/lib/libssl__L
  .if !defined(NO_OPENSSH)
  _prebuild_libs+=       secure/lib/libssh
  secure/lib/libssh__L: secure/lib/libcrypto__L lib/libz__L
@@ -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.

thanx,
bye,
-- 
------------------------------- ----------------------------------
Michael Bretterklieber          - http://www.bretterklieber.com
A-Quadrat Automation GmbH       - http://www.a-quadrat.at
Tel: ++43-(0)3172-41679         - GSM: ++43-(0)699 12861847
------------------------------- ----------------------------------
"...the number of UNIX installations has grown to 10, with more
expected..." - Dennis Ritchie and Ken Thompson, June 1972