On 18. 10. 12., Jung-uk Kim wrote: > On 18. 10. 11., Glen Barber wrote: >> On Thu, Oct 11, 2018 at 10:55:46PM +0000, Glen Barber wrote: >>> On Thu, Oct 11, 2018 at 10:32:34PM +0000, Glen Barber wrote: >>>> I still see a failure with this applied. >>>> >>>> ===> lib/libldns (obj,all,install) >>>> /usr/obj/usr/src/powerpc.powerpc/tmp/usr/bin/ld: cannot find -lssl >>>> --- libprivateldns.so.5.full --- >>>> *** [libprivateldns.so.5.full] Error code 1 >>>> >>>> I'll prune .OBJDIR and re-run without -jN to eliminate the possibility >>>> of a build race. >>>> >>> >>> It does not appear to be a build race. >>> >>> ===> secure/lib/libcrypto (obj,all,install) >>> /usr/src/crypto/openssl/crypto/err/err.c: In function 'err_load_strings': >>> /usr/src/crypto/openssl/crypto/err/err.c:311: warning: passing argument 2 >>> of 'lh_ERR_STRING_DATA_insert' discards qualifiers from pointer target type >>> /usr/src/crypto/openssl/crypto/err/err.c: In function 'err_load_strings': >>> /usr/src/crypto/openssl/crypto/err/err.c:311: warning: passing argument 2 >>> of 'lh_ERR_STRING_DATA_insert' discards qualifiers from pointer target type >>> /usr/obj/usr/src/powerpc.powerpc/tmp/usr/bin/ld: cannot find -lpthread >>> *** Error code 1 >>> >>> Stop. >>> make[4]: stopped in /usr/src/secure/lib/libcrypto >>> *** Error code 1 >>> >> >> In fact, on closer inspection, this patch breaks every architecture. > > I forgot to patch one more file, i.e., Makefile.inc1. Please try the > attached patch instead.
Darn, I attached an incomplete patch. This should be final. Sorry about the brain farts. I need some sleep. :-( Jung-uk Kim
Index: Makefile.inc1
===================================================================
--- Makefile.inc1 (revision 339324)
+++ Makefile.inc1 (working copy)
@@ -2534,8 +2534,8 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \
${_cddl_lib_libctf} \
lib/libufs \
lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \
- ${_secure_lib_libcrypto} ${_lib_libldns} \
- ${_secure_lib_libssh} ${_secure_lib_libssl}
+ ${_secure_lib_libcrypto} ${_secure_lib_libssl} \
+ ${_lib_libldns} ${_secure_lib_libssh}
.if ${MK_GNUCXX} != "no"
_prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++
@@ -2631,9 +2631,10 @@ lib/librtld_db__L: lib/libprocstat__L
_secure_lib_libcrypto= secure/lib/libcrypto
_secure_lib_libssl= secure/lib/libssl
lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L
+secure/lib/libcrypto__L: lib/libthr__L
.if ${MK_LDNS} != "no"
_lib_libldns= lib/libldns
-lib/libldns__L: secure/lib/libcrypto__L
+lib/libldns__L: secure/lib/libssl__L
.endif
.if ${MK_OPENSSH} != "no"
_secure_lib_libssh= secure/lib/libssh
Index: lib/libldns/Makefile
===================================================================
--- lib/libldns/Makefile (revision 339324)
+++ lib/libldns/Makefile (working copy)
@@ -19,7 +19,7 @@ SRCS= buffer.c dane.c dname.c dnssec.c dnssec_sign
SRCS+= b64_ntop.c b64_pton.c
-LIBADD= crypto
+LIBADD= ssl crypto
WARNS ?= 3
Index: share/mk/src.libnames.mk
===================================================================
--- share/mk/src.libnames.mk (revision 339324)
+++ share/mk/src.libnames.mk (working copy)
@@ -273,7 +273,7 @@ _DP_mp= crypto
_DP_memstat= kvm
_DP_magic= z
_DP_mt= sbuf bsdxml
-_DP_ldns= crypto
+_DP_ldns= ssl crypto
.if ${MK_OPENSSL} != "no"
_DP_fetch= ssl crypto
.else
signature.asc
Description: OpenPGP digital signature
