head 1.5; access; symbols netbsd-11-0-RC4:1.4.2.1 netbsd-11-0-RC3:1.4.2.1 netbsd-11-0-RC2:1.4.2.1 netbsd-11-0-RC1:1.4.2.1 perseant-exfatfs-base-20250801:1.4 netbsd-11:1.4.0.2 netbsd-11-base:1.4; locks; strict; comment @# @; 1.5 date 2025.08.09.18.36.03; author wiz; state Exp; branches; next 1.4; commitid 5SLHVaUy5qFSm56G; 1.4 date 2025.07.21.22.21.21; author christos; state Exp; branches 1.4.2.1; next 1.3; commitid EfV6iQV6VZVZdF3G; 1.3 date 2025.07.19.14.29.35; author christos; state Exp; branches; next 1.2; commitid wbJNh3EpXv0mGm3G; 1.2 date 2025.07.19.11.38.39; author christos; state Exp; branches; next 1.1; commitid dZ5mpY2kFCVDJl3G; 1.1 date 2025.07.17.14.26.12; author christos; state Exp; branches; next ; commitid 9yTxET2KrcqKI63G; 1.4.2.1 date 2025.08.16.16.20.22; author martin; state Exp; branches; next ; commitid elQSEPaCdnlzoY6G; desc @@ 1.5 log @libssl: link against libcrypto like we did for OpenSSL < 3.5 Also matches what upstream does. Patch from RVP via current-users. @ text @# $NetBSD: Makefile,v 1.4 2025/07/21 22:21:21 christos Exp $ # RCSid: # Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp # # @@(#) Copyright (c) 1994 Simon J. Gerraty # # This file is provided in the hope that it will # be of use. There is absolutely NO WARRANTY. # Permission to copy, redistribute or otherwise # use this file is hereby granted provided that # the above copyright notice and this notice are # left intact. # # Please send copies of changes and bug-fixes to: # sjg@@quick.com.au # .include USE_FORT?=yes # cryptographic software and network library CWARNFLAGS.clang+= -Wno-unused-value # XXX: This warning seems to trigger incorrectly CWARNFLAGS.clang+= -Wno-atomic-alignment LIB= ssl CPPFLAGS+= -Dlib${LIB} -I${OPENSSLSRC} -I${OPENSSLSRC}/crypto CPPFLAGS+= -I${OPENSSLSRC}/include CRYPTODIST= ${NETBSDSRCDIR}/crypto .include "${NETBSDSRCDIR}/crypto/Makefile.openssl" .PATH: ${OPENSSLSRC} ${OPENSSLSRC}/crypto/pqueue ${OPENSSLSRC}/include/openssl .include "srcs.inc" LIBDPLIBS+=crypto ${.CURDIR}/../libcrypto AFLAGS+=-DELF # This is from the include/openssl directory; see ../libcrypto/Makefile INCS= dtls1.h ssl.h ssl2.h ssl3.h tls1.h srtp.h async.h INCSDIR=/usr/include/openssl VERSION_MAP= ssl.map PKGCONFIG=libssl openssl .include "${.CURDIR}/../../pkgconfig.mk" GENH = \ ssl.h .for i in ${GENH} $i: $i.in ${_MKTARGET_CREATE} ${HOST_SH} ${.CURDIR}/../libcrypto/gen ${.ALLSRC} > ${.TARGET} .endfor .include @ 1.4 log @Instead of linking against libcrypto.a to get all the hidden methods, compile them directly. It is not that many of them and it is cleaner this way. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2025/07/19 14:29:35 christos Exp $ d38 2 @ 1.4.2.1 log @Pull up following revision(s) (requested by wiz in ticket #9): crypto/external/apache2/openssl/lib/libssl/Makefile: revision 1.5 libssl: link against libcrypto like we did for OpenSSL < 3.5 Also matches what upstream does. Patch from RVP via current-users. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4 2025/07/21 22:21:21 christos Exp $ a37 2 LIBDPLIBS+=crypto ${.CURDIR}/../libcrypto @ 1.3 log @handle vax @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.2 2025/07/19 11:38:39 christos Exp $ a36 12 #.PATH: ${OPENSSLSRC}/crypto #SRCS+= packet.c LIBCRYPTO!= cd ${.CURDIR}/../libcrypto && ${PRINTOBJDIR} .if exists(${LIBCRYPTO}/libcrypto_pic.a) LDADD+= ${LIBCRYPTO}/libcrypto_pic.a DPADD+= ${LIBCRYPTO}/libcrypto_pic.a # vax is always pic .elif exists(${LIBCRYPTO}/libcrypto.a) LDADD+= ${LIBCRYPTO}/libcrypto.a DPADD+= ${LIBCRYPTO}/libcrypto.a .endif a48 2 @ 1.2 log @Add dependency on libcrypto.a @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1 2025/07/17 14:26:12 christos Exp $ d44 4 @ 1.1 log @Add build glue and generated files. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.19 2024/11/01 23:44:04 riastradh Exp $ d43 1 @