head 1.4; access; symbols netbsd-11-0-RC4:1.3.2.1 netbsd-11-0-RC3:1.3.2.1 netbsd-11-0-RC2:1.3.2.1 netbsd-11-0-RC1:1.3.2.1 perseant-exfatfs-base-20250801:1.3 netbsd-11:1.3.0.2 netbsd-11-base:1.3 netbsd-10-1-RELEASE:1.2 perseant-exfatfs-base-20240630:1.2 perseant-exfatfs:1.2.0.58 perseant-exfatfs-base:1.2 netbsd-8-3-RELEASE:1.2 netbsd-9-4-RELEASE:1.2 netbsd-10-0-RELEASE:1.2 netbsd-10-0-RC6:1.2 netbsd-10-0-RC5:1.2 netbsd-10-0-RC4:1.2 netbsd-10-0-RC3:1.2 netbsd-10-0-RC2:1.2 netbsd-10-0-RC1:1.2 netbsd-10:1.2.0.56 netbsd-10-base:1.2 netbsd-9-3-RELEASE:1.2 cjep_sun2x-base1:1.2 cjep_sun2x:1.2.0.54 cjep_sun2x-base:1.2 cjep_staticlib_x-base1:1.2 netbsd-9-2-RELEASE:1.2 cjep_staticlib_x:1.2.0.52 cjep_staticlib_x-base:1.2 netbsd-9-1-RELEASE:1.2 phil-wifi-20200421:1.2 phil-wifi-20200411:1.2 is-mlppp:1.2.0.50 is-mlppp-base:1.2 phil-wifi-20200406:1.2 netbsd-8-2-RELEASE:1.2 netbsd-9-0-RELEASE:1.2 netbsd-9-0-RC2:1.2 netbsd-9-0-RC1:1.2 phil-wifi-20191119:1.2 netbsd-9:1.2.0.48 netbsd-9-base:1.2 phil-wifi-20190609:1.2 netbsd-8-1-RELEASE:1.2 netbsd-8-1-RC1:1.2 pgoyette-compat-merge-20190127:1.2 pgoyette-compat-20190127:1.2 pgoyette-compat-20190118:1.2 pgoyette-compat-1226:1.2 pgoyette-compat-1126:1.2 pgoyette-compat-1020:1.2 pgoyette-compat-0930:1.2 pgoyette-compat-0906:1.2 netbsd-7-2-RELEASE:1.2 pgoyette-compat-0728:1.2 netbsd-8-0-RELEASE:1.2 phil-wifi:1.2.0.46 phil-wifi-base:1.2 pgoyette-compat-0625:1.2 netbsd-8-0-RC2:1.2 pgoyette-compat-0521:1.2 pgoyette-compat-0502:1.2 pgoyette-compat-0422:1.2 netbsd-8-0-RC1:1.2 pgoyette-compat-0415:1.2 pgoyette-compat-0407:1.2 pgoyette-compat-0330:1.2 pgoyette-compat-0322:1.2 pgoyette-compat-0315:1.2 netbsd-7-1-2-RELEASE:1.2 pgoyette-compat:1.2.0.44 pgoyette-compat-base:1.2 netbsd-7-1-1-RELEASE:1.2 matt-nb8-mediatek:1.2.0.42 matt-nb8-mediatek-base:1.2 perseant-stdc-iso10646:1.2.0.40 perseant-stdc-iso10646-base:1.2 netbsd-8:1.2.0.38 netbsd-8-base:1.2 prg-localcount2-base3:1.2 prg-localcount2-base2:1.2 prg-localcount2-base1:1.2 prg-localcount2:1.2.0.36 prg-localcount2-base:1.2 pgoyette-localcount-20170426:1.2 bouyer-socketcan-base1:1.2 pgoyette-localcount-20170320:1.2 netbsd-7-1:1.2.0.34 netbsd-7-1-RELEASE:1.2 netbsd-7-1-RC2:1.2 netbsd-7-nhusb-base-20170116:1.2 bouyer-socketcan:1.2.0.32 bouyer-socketcan-base:1.2 pgoyette-localcount-20170107:1.2 netbsd-7-1-RC1:1.2 pgoyette-localcount-20161104:1.2 netbsd-7-0-2-RELEASE:1.2 localcount-20160914:1.2 netbsd-7-nhusb:1.2.0.30 netbsd-7-nhusb-base:1.2 pgoyette-localcount-20160806:1.2 pgoyette-localcount-20160726:1.2 pgoyette-localcount:1.2.0.28 pgoyette-localcount-base:1.2 netbsd-7-0-1-RELEASE:1.2 netbsd-7-0:1.2.0.26 netbsd-7-0-RELEASE:1.2 netbsd-7-0-RC3:1.2 netbsd-7-0-RC2:1.2 netbsd-7-0-RC1:1.2 netbsd-5-2-3-RELEASE:1.1 netbsd-5-1-5-RELEASE:1.1 netbsd-6-0-6-RELEASE:1.2 netbsd-6-1-5-RELEASE:1.2 netbsd-7:1.2.0.24 netbsd-7-base:1.2 yamt-pagecache-base9:1.2 yamt-pagecache-tag8:1.2 netbsd-6-1-4-RELEASE:1.2 netbsd-6-0-5-RELEASE:1.2 tls-earlyentropy:1.2.0.22 tls-earlyentropy-base:1.2 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2 riastradh-drm2-base3:1.2 netbsd-6-1-3-RELEASE:1.2 netbsd-6-0-4-RELEASE:1.2 netbsd-5-2-2-RELEASE:1.1 netbsd-5-1-4-RELEASE:1.1 netbsd-6-1-2-RELEASE:1.2 netbsd-6-0-3-RELEASE:1.2 netbsd-5-2-1-RELEASE:1.1 netbsd-5-1-3-RELEASE:1.1 netbsd-6-1-1-RELEASE:1.2 riastradh-drm2-base2:1.2 riastradh-drm2-base1:1.2 riastradh-drm2:1.2.0.16 riastradh-drm2-base:1.2 netbsd-6-1:1.2.0.20 netbsd-6-0-2-RELEASE:1.2 netbsd-6-1-RELEASE:1.2 netbsd-6-1-RC4:1.2 netbsd-6-1-RC3:1.2 agc-symver:1.2.0.18 agc-symver-base:1.2 netbsd-6-1-RC2:1.2 netbsd-6-1-RC1:1.2 yamt-pagecache-base8:1.2 netbsd-5-2:1.1.0.40 netbsd-6-0-1-RELEASE:1.2 yamt-pagecache-base7:1.2 netbsd-5-2-RELEASE:1.1 netbsd-5-2-RC1:1.1 matt-nb6-plus-nbase:1.2 yamt-pagecache-base6:1.2 netbsd-6-0:1.2.0.14 netbsd-6-0-RELEASE:1.2 netbsd-6-0-RC2:1.2 tls-maxphys:1.2.0.12 tls-maxphys-base:1.2 matt-nb6-plus:1.2.0.10 matt-nb6-plus-base:1.2 netbsd-6-0-RC1:1.2 yamt-pagecache-base5:1.2 yamt-pagecache-base4:1.2 netbsd-6:1.2.0.8 netbsd-6-base:1.2 netbsd-5-1-2-RELEASE:1.1 netbsd-5-1-1-RELEASE:1.1 yamt-pagecache-base3:1.2 yamt-pagecache-base2:1.2 yamt-pagecache:1.2.0.6 yamt-pagecache-base:1.2 cherry-xenmp:1.2.0.4 cherry-xenmp-base:1.2 bouyer-quota2-nbase:1.2 bouyer-quota2:1.2.0.2 bouyer-quota2-base:1.2 matt-mips64-premerge-20101231:1.2 matt-nb5-mips64-premerge-20101231:1.1 matt-nb5-pq3:1.1.0.38 matt-nb5-pq3-base:1.1 netbsd-5-1:1.1.0.36 netbsd-5-1-RELEASE:1.1 netbsd-5-1-RC4:1.1 matt-nb5-mips64-k15:1.1 netbsd-5-1-RC3:1.1 netbsd-5-1-RC2:1.1 netbsd-5-1-RC1:1.1 netbsd-5-0-2-RELEASE:1.1 matt-nb5-mips64-premerge-20091211:1.1 matt-premerge-20091211:1.2 matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.1 matt-nb4-mips64-k7-u2a-k9b:1.1 matt-nb5-mips64-u1-k1-k5:1.1 matt-nb5-mips64:1.1.0.34 netbsd-5-0-1-RELEASE:1.1 jym-xensuspend-nbase:1.2 netbsd-5-0:1.1.0.32 netbsd-5-0-RELEASE:1.1 netbsd-5-0-RC4:1.1 netbsd-5-0-RC3:1.1 netbsd-5-0-RC2:1.1 jym-xensuspend:1.1.0.30 jym-xensuspend-base:1.2 netbsd-5-0-RC1:1.1 netbsd-5:1.1.0.28 netbsd-5-base:1.1 matt-mips64-base2:1.1 matt-mips64:1.1.0.26 mjf-devfs2:1.1.0.24 mjf-devfs2-base:1.1 netbsd-4-0-1-RELEASE:1.1 wrstuden-revivesa-base-3:1.1 wrstuden-revivesa-base-2:1.1 wrstuden-fixsa-newbase:1.1 wrstuden-revivesa-base-1:1.1 yamt-pf42-base4:1.1 yamt-pf42-base3:1.1 hpcarm-cleanup-nbase:1.1 yamt-pf42-baseX:1.1 yamt-pf42-base2:1.1 wrstuden-revivesa:1.1.0.22 wrstuden-revivesa-base:1.1 yamt-pf42:1.1.0.20 yamt-pf42-base:1.1 keiichi-mipv6-nbase:1.1 keiichi-mipv6:1.1.0.18 keiichi-mipv6-base:1.1 matt-armv6-nbase:1.1 matt-armv6-prevmlocking:1.1 wrstuden-fixsa-base-1:1.1 netbsd-4-0:1.1.0.16 netbsd-4-0-RELEASE:1.1 cube-autoconf:1.1.0.14 cube-autoconf-base:1.1 netbsd-4-0-RC5:1.1 netbsd-4-0-RC4:1.1 netbsd-4-0-RC3:1.1 netbsd-4-0-RC2:1.1 netbsd-4-0-RC1:1.1 matt-armv6:1.1.0.12 matt-armv6-base:1.1 matt-mips64-base:1.1 hpcarm-cleanup:1.1.0.10 hpcarm-cleanup-base:1.1 wrstuden-fixsa:1.1.0.8 wrstuden-fixsa-base:1.1 abandoned-netbsd-4-base:1.1 abandoned-netbsd-4:1.1.0.4 netbsd-4:1.1.0.6 netbsd-4-base:1.1 chap-midi-nbase:1.1 chap-midi:1.1.0.2 chap-midi-base:1.1; locks; strict; comment @# @; 1.4 date 2025.10.19.01.00.00; author riastradh; state Exp; branches; next 1.3; commitid so4x7W8YXx0gf7fG; 1.3 date 2025.07.19.12.42.30; author christos; state Exp; branches 1.3.2.1; next 1.2; commitid 5OEUNSt3FcDB5m3G; 1.2 date 2009.04.14.22.15.24; author lukem; state Exp; branches 1.2.58.1; next 1.1; 1.1 date 2006.01.24.18.59.23; author elad; state Exp; branches 1.1.30.1; next ; 1.3.2.1 date 2025.11.20.18.46.42; author martin; state Exp; branches; next ; commitid ggkiZDsnElnr7kjG; 1.2.58.1 date 2025.08.02.05.58.41; author perseant; state Exp; branches; next ; commitid 23j6GFaDws3O875G; 1.1.30.1 date 2009.05.13.19.19.58; author jym; state Exp; branches; next ; desc @@ 1.4 log @openssl: Stop dragging libpthread into every libcrypto user. With the new _NETBSD_PTHREAD_CREATE_WEAK, libcrypto can have a call to pthread_create without linking against libpthread, so it is not necessary to link all libcrypto users against libpthread too. Applications that link against libcrypto but not libpthread can't use threaded OpenSSL functionality, of course -- OSSL_set_max_threads will always fail in such applications. This reverts all the makefile churn that I found for unnecessary libpthread linkage since the openssl 3.5 import. PR lib/59685: libcrypto should not depend on libpthread @ text @# $NetBSD: Makefile.inc,v 1.3 2025/07/19 12:42:30 christos Exp $ .include DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto .if exists(${.CURDIR}/../../Makefile.inc) .include "${.CURDIR}/../../Makefile.inc" .endif @ 1.3 log @crypto needs threads @ text @d1 1 a1 1 # $NetBSD: Makefile.inc,v 1.2 2009/04/14 22:15:24 lukem Exp $ d5 2 a6 2 DPADD+= ${LIBCRYPTO} ${LIBPTHREAD} LDADD+= -lcrypto -lpthread @ 1.3.2.1 log @Pull up following revision(s) (requested by riz in ticket #90): games/factor/Makefile: revision 1.17 etc/mtree/NetBSD.dist.tests: revision 1.211 usr.sbin/plainrsa-gen/Makefile: revision 1.8 tests/lib/libpthread/weak/t_pthread_weak_threaded.c: revision 1.1 lib/libc/shlib_version: revision 1.300 tests/lib/libpthread/weak/test/Makefile: file removal libexec/httpd/Makefile: revision 1.37 usr.bin/nbsvtool/Makefile: revision 1.5 usr.bin/moduli/Makefile.inc: revision 1.4 distrib/sets/lists/tests/shl.mi: revision 1.17 external/bsd/nsd/Makefile.inc: revision 1.11 tests/lib/libpthread/weak/test/t_pthread_weak_threaded.c: revision 1.1 tests/lib/libpthread/weak/Makefile: revision 1.1 tests/lib/libpthread/weak/test/Makefile: revision 1.1 tests/lib/libpthread/weak/Makefile: revision 1.2 lib/libpthread/pthread.c: revision 1.188 crypto/external/apache2/openssl/dist/crypto/thread/api.c: revision 1.2 usr.sbin/syslogd/Makefile: revision 1.39 tests/lib/libpthread/weak/test/t_pthread_weak_nothread.c: file removal lib/libpthread/pthread_mi.expsym: revision 1.3 distrib/sets/lists/base/shl.mi: revision 1.1015 crypto/external/apache2/openssl/lib/libssl/thread.inc: revision 1.2 usr.bin/dc/Makefile: revision 1.7 tests/usr.bin/cc/Makefile: revision 1.10 tests/crypto/libcrypto/Makefile: revision 1.18 tests/lib/libpthread/weak/t_pthread_weak_nothread.c: revision 1.1 lib/libpthread/pthread_attr.c: revision 1.22 crypto/external/apache2/openssl/lib/libcrypto/thread.inc: revision 1.2 external/bsd/wpa/bin/wpa_passphrase/Makefile: revision 1.8 external/bsd/tcpdump/bin/Makefile: revision 1.29 external/bsd/ppp/usr.sbin/pppd/Makefile: revision 1.6 lib/libpthread/pthread.h: revision 1.42 crypto/external/bsd/heimdal/Makefile.inc: revision 1.14 tests/lib/libpthread/weak/test/t_pthread_weak_nothread.c: revision 1.1 distrib/sets/lists/debug/shl.mi: revision 1.373 usr.bin/ftp/Makefile: revision 1.44 crypto/external/bsd/netpgp/bin/Makefile.inc: revision 1.2 distrib/sets/lists/tests/mi: revision 1.1395 external/bsd/pam-u2f/bin/pamu2fcfg/Makefile: revision 1.8 distrib/sets/lists/tests/mi: revision 1.1396 distrib/sets/lists/debug/shl.mi: revision 1.376 tests/lib/libpthread/Makefile: revision 1.20 tests/lib/libc/hash/Makefile: revision 1.6 tests/crypto/libcrypto/dh/Makefile: revision 1.4 tests/lib/libpthread/Makefile: revision 1.21 tests/lib/libpthread/weak/lib/Makefile: revision 1.1 tests/lib/libpthread/weak/Makefile.inc: revision 1.1 tests/lib/libpthread/Makefile: revision 1.22 crypto/external/apache2/openssl/lib/libcrypto/Makefile: revision 1.3 external/bsd/libfido2/bin/Makefile.inc: revision 1.5 lib/libc/include/reentrant.h: revision 1.24 tests/lib/libpthread/weak/lib/h_pthread_weak.h: revision 1.1 tests/lib/libpthread/weak/lib/h_pthread_weak.c: revision 1.1 share/mk/bsd.prog.mk: revision 1.357 tests/crypto/libcrypto/Makefile.inc: revision 1.14 lib/libpthread/shlib_version: revision 1.21 external/bsd/wpa/bin/hostapd/Makefile: revision 1.21 external/bsd/ntp/Makefile.inc: revision 1.26 crypto/external/bsd/heimdal/bin/hxtool/Makefile: revision 1.8 external/bsd/wpa/bin/wpa_supplicant/Makefile: revision 1.14 distrib/sets/lists/debug/mi: revision 1.487 crypto/external/apache2/openssl/bin/Makefile: revision 1.2 lib/libc/thread-stub/thread-stub.c: revision 1.34 tests/usr.bin/cc/t_pthread_abuse.sh: revision 1.1 tests/lib/libpthread/weak/test/t_pthread_weak_threaded.c: file removal crypto/external/bsd/openssh/bin/Makefile.inc: revision 1.8 libpthread: Test pthread_create link errors without -(l)pthread. Prompted by: PR lib/59685: libcrypto should not depend on libpthread libc: Expose some more pthread stubs. Additionally, provide the option for pthread.h to expose pthread_create so that libc can provide a weak stub for it, if you define _NETBSD_PTHREAD_CREATE_WEAK. This allows libraries to use the functions without linking against libpthread for applications that don't need threads. For example, with OpenSSL's libcrypto, as long as you don't try to raise OSSL_set_max_threads above 0, it won't ever try pthread_create. New pthread.h macros defined: pthread_attr_destroy __libc_thr_attr_destroy pthread_attr_init __libc_thr_attr_init pthread_attr_setdetachstate __libc_thr_attr_setdetachstate pthread_detach __libc_thr_detach pthread_join __libc_thr_join New pthread.h macros defined if _NETBSD_PTHREAD_CREATE_WEAK is defined first: pthread_create __libc_thr_create New symbols defined by libc as weak aliases for stubs that always fail but can be overridden by libpthread: __libc_thr_attr_destroy __libc_thr_attr_init __libc_thr_attr_setdetachstate __libc_thr_detach __libc_thr_join Note that libc already defined __libc_thr_create. New internal stubs, not for overriding: __libc_thr_detach_stub __libc_thr_join_stub These were formerly called __libc_pthread_detach and __libc_pthread_join, respectively, and libc has defined weak aliases pthread_detach and pthread_join for them since 2013. I retained all four of those symbols, but defined new ones in the __ namespace that match the pattern for other thread stubs to avoid raising questions about why the pattern seems to be broken. I left a comment noting this fact too. New pthread strong aliases to override the libc symbols: __libc_thr_attr_destroy __libc_thr_attr_init __libc_thr_attr_setdetachstate __libc_thr_detach __libc_thr_join Note that pthread already defined a strong __libc_thr_create alias for the real pthread_create, so there is no need to add a new one. PR lib/59685: libcrypto should not depend on libpthread libpthread: Test pthread stubs in threaded vs non-threaded programs. PR lib/59685: libcrypto should not depend on libpthread libpthread: append to SUBDIR instead of overwrite it Noticed and from <riastradh>, thanks! PR lib/59685: libcrypto should not depend on libpthread tests/lib/libpthread: Fix tests in subdirectory. Need to use TESTS_SUBDIRS for this, not SUBDIR. Avoid the extra nesting level while here; can make the library be a subdirectory of the directory where the tests live. PR lib/59685: libcrypto should not depend on libpthread openssl: Stop dragging libpthread into every libcrypto user. With the new _NETBSD_PTHREAD_CREATE_WEAK, libcrypto can have a call to pthread_create without linking against libpthread, so it is not necessary to link all libcrypto users against libpthread too. Applications that link against libcrypto but not libpthread can't use threaded OpenSSL functionality, of course -- OSSL_set_max_threads will always fail in such applications. This reverts all the makefile churn that I found for unnecessary libpthread linkage since the openssl 3.5 import. PR lib/59685: libcrypto should not depend on libpthread libc, libpthread: Bump for pthread stub additions. New symbols were added a couple weeks ago but I forgot to bump the shlib minors. PR lib/59685: libcrypto should not depend on libpthread @ text @d1 1 a1 1 # $NetBSD: Makefile.inc,v 1.3 2025/07/19 12:42:30 christos Exp $ d5 2 a6 2 DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto @ 1.2 log @Enable WARNS=4 by default for usr.bin, except for: awk bdes checknr compile_et error gss hxtool kgetcred kinit klist ldd less lex locale login m4 man menuc mk_cmds mklocale msgc openssl rpcgen rpcinfo sdiff spell ssh string2key telnet tn3270 verify_krb5_conf xlint @ text @d1 1 a1 1 # $NetBSD: Makefile.inc,v 1.1 2006/01/24 18:59:23 elad Exp $ d5 2 a6 2 DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto @ 1.2.58.1 log @Sync with HEAD @ text @d1 1 a1 1 # $NetBSD: Makefile.inc,v 1.3 2025/07/19 12:42:30 christos Exp $ d5 2 a6 2 DPADD+= ${LIBCRYPTO} ${LIBPTHREAD} LDADD+= -lcrypto -lpthread @ 1.1 log @Put qsieve/qsafe in usr.bin. @ text @d1 1 a1 1 # $NetBSD$ a4 1 WARNS=4 @ 1.1.30.1 log @Sync with HEAD. Third (and last) commit. See http://mail-index.netbsd.org/source-changes/2009/05/13/msg221222.html @ text @d1 1 a1 1 # $NetBSD: Makefile.inc,v 1.2 2009/04/14 22:15:24 lukem Exp $ d5 1 @