diff --git a/Makefile.inc1 b/Makefile.inc1 index 4bd85a8cbf04..ef63bfd52381 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -770,7 +770,6 @@ BSARGS= DESTDIR= \ MK_CLANG_FULL=no \ MK_HTML=no \ MK_MAN=no \ - MK_PROFILE=no \ MK_RETPOLINE=no \ MK_SSP=no \ MK_TESTS=no \ @@ -837,7 +836,6 @@ KTMAKE= ${TIME_ENV} \ MK_CTF=no \ MK_HTML=no \ MK_MAN=no \ - MK_PROFILE=no \ MK_SSP=no \ MK_RETPOLINE=no \ MK_WERROR=no @@ -1207,7 +1205,7 @@ _libraries: @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; \ ${WMAKE} -DNO_FSCHG MK_HTML=no -DNO_LINT MK_MAN=no \ - MK_PROFILE=no MK_TESTS=no MK_TESTS_SUPPORT=${MK_TESTS_SUPPORT} \ + MK_TESTS=no MK_TESTS_SUPPORT=${MK_TESTS_SUPPORT} \ libraries everything: .PHONY @echo @@ -3086,7 +3084,6 @@ NXBMAKEARGS+= \ MK_MAN_UTILS=yes \ MK_OFED=no \ MK_OPENSSH=no \ - MK_PROFILE=no \ MK_RETPOLINE=no \ MK_SENDMAIL=no \ MK_SSP=no \ @@ -3451,9 +3448,9 @@ ${_lib}__PL: .PHONY .MAKE ${_+_}@${ECHODIR} "===> ${_lib} (obj,all,install)"; \ cd ${.CURDIR}/${_lib}; \ if [ -z "${NO_OBJWALK}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; fi; \ - ${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \ + ${MAKE} MK_TESTS=no -DNO_PIC \ DIRPRFX=${_lib}/ all; \ - ${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \ + ${MAKE} MK_TESTS=no -DNO_PIC \ DIRPRFX=${_lib}/ install .endif .endfor @@ -3756,7 +3753,7 @@ XDEV_CPUTYPE?=${TARGET_CPUTYPE} .endif NOFUN=-DNO_FSCHG MK_HTML=no -DNO_LINT \ - MK_MAN=no MK_NLS=no MK_PROFILE=no \ + MK_MAN=no MK_NLS=no \ MK_KERBEROS=no MK_RESCUE=no MK_TESTS=no MK_WERROR=no \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ CPUTYPE=${XDEV_CPUTYPE} diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 75414bd1a111..57e0f4609050 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,189 @@ # xargs -n1 | sort | uniq -d; # done +# 20241112: Retire MK_PROFILE support +OLD_FILES+=usr/lib/lib80211_p.a +OLD_FILES+=usr/lib/lib9p_p.a +OLD_FILES+=usr/lib/libBlocksRuntime_p.a +OLD_FILES+=usr/lib/libalias_dummy_p.a +OLD_FILES+=usr/lib/libalias_ftp_p.a +OLD_FILES+=usr/lib/libalias_irc_p.a +OLD_FILES+=usr/lib/libalias_nbt_p.a +OLD_FILES+=usr/lib/libalias_p.a +OLD_FILES+=usr/lib/libalias_pptp_p.a +OLD_FILES+=usr/lib/libalias_skinny_p.a +OLD_FILES+=usr/lib/libalias_smedia_p.a +OLD_FILES+=usr/lib/libarchive_p.a +OLD_FILES+=usr/lib/libasn1_p.a +OLD_FILES+=usr/lib/libauditd_p.a +OLD_FILES+=usr/lib/libavl_p.a +OLD_FILES+=usr/lib/libbe_p.a +OLD_FILES+=usr/lib/libbegemot_p.a +OLD_FILES+=usr/lib/libblacklist_p.a +OLD_FILES+=usr/lib/libbluetooth_p.a +OLD_FILES+=usr/lib/libbsdxml_p.a +OLD_FILES+=usr/lib/libbsm_p.a +OLD_FILES+=usr/lib/libbsnmp_p.a +OLD_FILES+=usr/lib/libbz2_p.a +OLD_FILES+=usr/lib/libc++_p.a +OLD_FILES+=usr/lib/libc_p.a +OLD_FILES+=usr/lib/libcalendar_p.a +OLD_FILES+=usr/lib/libcam_p.a +OLD_FILES+=usr/lib/libcom_err_p.a +OLD_FILES+=usr/lib/libcompat_p.a +OLD_FILES+=usr/lib/libcompiler_rt_p.a +OLD_FILES+=usr/lib/libcrypt_p.a +OLD_FILES+=usr/lib/libcrypto_p.a +OLD_FILES+=usr/lib/libctf_p.a +OLD_FILES+=usr/lib/libcurses_p.a +OLD_FILES+=usr/lib/libcursesw_p.a +OLD_FILES+=usr/lib/libcuse_p.a +OLD_FILES+=usr/lib/libcxxrt_p.a +OLD_FILES+=usr/lib/libdevctl_p.a +OLD_FILES+=usr/lib/libdevinfo_p.a +OLD_FILES+=usr/lib/libdevstat_p.a +OLD_FILES+=usr/lib/libdialog_p.a +OLD_FILES+=usr/lib/libdl_p.a +OLD_FILES+=usr/lib/libdpv_p.a +OLD_FILES+=usr/lib/libdtrace_p.a +OLD_FILES+=usr/lib/libdwarf_p.a +OLD_FILES+=usr/lib/libedit_p.a +OLD_FILES+=usr/lib/libefivar_p.a +OLD_FILES+=usr/lib/libelf_p.a +OLD_FILES+=usr/lib/libexecinfo_p.a +OLD_FILES+=usr/lib/libfetch_p.a +OLD_FILES+=usr/lib/libfigpar_p.a +OLD_FILES+=usr/lib/libfl_p.a +OLD_FILES+=usr/lib/libform_p.a +OLD_FILES+=usr/lib/libformw_p.a +OLD_FILES+=usr/lib/libgcc_eh_p.a +OLD_FILES+=usr/lib/libgcc_p.a +OLD_FILES+=usr/lib/libgeom_p.a +OLD_FILES+=usr/lib/libgpio_p.a +OLD_FILES+=usr/lib/libgssapi_krb5_p.a +OLD_FILES+=usr/lib/libgssapi_ntlm_p.a +OLD_FILES+=usr/lib/libgssapi_p.a +OLD_FILES+=usr/lib/libgssapi_spnego_p.a +OLD_FILES+=usr/lib/libhdb_p.a +OLD_FILES+=usr/lib/libheimbase_p.a +OLD_FILES+=usr/lib/libheimntlm_p.a +OLD_FILES+=usr/lib/libheimsqlite_p.a +OLD_FILES+=usr/lib/libhistory_p.a +OLD_FILES+=usr/lib/libhx509_p.a +OLD_FILES+=usr/lib/libicp_p.a +OLD_FILES+=usr/lib/libicp_rescue_p.a +OLD_FILES+=usr/lib/libipsec_p.a +OLD_FILES+=usr/lib/libipt_p.a +OLD_FILES+=usr/lib/libjail_p.a +OLD_FILES+=usr/lib/libkadm5clnt_p.a +OLD_FILES+=usr/lib/libkadm5srv_p.a +OLD_FILES+=usr/lib/libkafs5_p.a +OLD_FILES+=usr/lib/libkdc_p.a +OLD_FILES+=usr/lib/libkiconv_p.a +OLD_FILES+=usr/lib/libkrb5_p.a +OLD_FILES+=usr/lib/libkvm_p.a +OLD_FILES+=usr/lib/libl_p.a +OLD_FILES+=usr/lib/libln_p.a +OLD_FILES+=usr/lib/liblzma_p.a +OLD_FILES+=usr/lib/libm_p.a +OLD_FILES+=usr/lib/libmagic_p.a +OLD_FILES+=usr/lib/libmd_p.a +OLD_FILES+=usr/lib/libmemstat_p.a +OLD_FILES+=usr/lib/libmenu_p.a +OLD_FILES+=usr/lib/libmenuw_p.a +OLD_FILES+=usr/lib/libmilter_p.a +OLD_FILES+=usr/lib/libmp_p.a +OLD_FILES+=usr/lib/libmt_p.a +OLD_FILES+=usr/lib/libncurses_p.a +OLD_FILES+=usr/lib/libncursesw_p.a +OLD_FILES+=usr/lib/libnetgraph_p.a +OLD_FILES+=usr/lib/libnetmap_p.a +OLD_FILES+=usr/lib/libnss_tacplus_p.a +OLD_FILES+=usr/lib/libnv_p.a +OLD_FILES+=usr/lib/libnvpair_p.a +OLD_FILES+=usr/lib/libopencsd_p.a +OLD_FILES+=usr/lib/libopie_p.a +OLD_FILES+=usr/lib/libpanel_p.a +OLD_FILES+=usr/lib/libpanelw_p.a +OLD_FILES+=usr/lib/libpathconv_p.a +OLD_FILES+=usr/lib/libpcap_p.a +OLD_FILES+=usr/lib/libpjdlog_p.a +OLD_FILES+=usr/lib/libpmc_p.a +OLD_FILES+=usr/lib/libprivateatf-c++_p.a +OLD_FILES+=usr/lib/libprivateatf-c_p.a +OLD_FILES+=usr/lib/libprivateauditd_p.a +OLD_FILES+=usr/lib/libprivatebsdstat_p.a +OLD_FILES+=usr/lib/libprivatecbor_p.a +OLD_FILES+=usr/lib/libprivatedevdctl_p.a +OLD_FILES+=usr/lib/libprivateevent_p.a +OLD_FILES+=usr/lib/libprivateevent1_p.a +OLD_FILES+=usr/lib/libprivatefido2_p.a +OLD_FILES+=usr/lib/libprivategmock_main_p.a +OLD_FILES+=usr/lib/libprivategmock_p.a +OLD_FILES+=usr/lib/libprivategtest_main_p.a +OLD_FILES+=usr/lib/libprivategtest_p.a +OLD_FILES+=usr/lib/libprivateheimipcc_p.a +OLD_FILES+=usr/lib/libprivateheimipcs_p.a +OLD_FILES+=usr/lib/libprivateifconfig_p.a +OLD_FILES+=usr/lib/libprivateldns_p.a +OLD_FILES+=usr/lib/libprivatesqlite3_p.a +OLD_FILES+=usr/lib/libprivatessh_p.a +OLD_FILES+=usr/lib/libprivateucl_p.a +OLD_FILES+=usr/lib/libprivateunbound_p.a +OLD_FILES+=usr/lib/libprivatezstd_p.a +OLD_FILES+=usr/lib/libproc_p.a +OLD_FILES+=usr/lib/libprocstat_p.a +OLD_FILES+=usr/lib/libpthread_p.a +OLD_FILES+=usr/lib/libradius_p.a +OLD_FILES+=usr/lib/libregex_p.a +OLD_FILES+=usr/lib/libroken_p.a +OLD_FILES+=usr/lib/librpcsvc_p.a +OLD_FILES+=usr/lib/librss_p.a +OLD_FILES+=usr/lib/librt_p.a +OLD_FILES+=usr/lib/librtld_db_p.a +OLD_FILES+=usr/lib/libsbuf_p.a +OLD_FILES+=usr/lib/libsdp_p.a +OLD_FILES+=usr/lib/libsmb_p.a +OLD_FILES+=usr/lib/libspl_p.a +OLD_FILES+=usr/lib/libssl_p.a +OLD_FILES+=usr/lib/libstats_p.a +OLD_FILES+=usr/lib/libstdbuf_p.a +OLD_FILES+=usr/lib/libstdc++_p.a +OLD_FILES+=usr/lib/libstdthreads_p.a +OLD_FILES+=usr/lib/libsupc++_p.a +OLD_FILES+=usr/lib/libsysdecode_p.a +OLD_FILES+=usr/lib/libtacplus_p.a +OLD_FILES+=usr/lib/libtermcap_p.a +OLD_FILES+=usr/lib/libtermcapw_p.a +OLD_FILES+=usr/lib/libtermlib_p.a +OLD_FILES+=usr/lib/libtermlibw_p.a +OLD_FILES+=usr/lib/libthr_p.a +OLD_FILES+=usr/lib/libthread_db_p.a +OLD_FILES+=usr/lib/libtinfo_p.a +OLD_FILES+=usr/lib/libtinfow_p.a +OLD_FILES+=usr/lib/libtpool_p.a +OLD_FILES+=usr/lib/libufs_p.a +OLD_FILES+=usr/lib/libugidfw_p.a +OLD_FILES+=usr/lib/libulog_p.a +OLD_FILES+=usr/lib/libumem_p.a +OLD_FILES+=usr/lib/libusb_p.a +OLD_FILES+=usr/lib/libusbhid_p.a +OLD_FILES+=usr/lib/libutempter_p.a +OLD_FILES+=usr/lib/libutil_p.a +OLD_FILES+=usr/lib/libuutil_p.a +OLD_FILES+=usr/lib/libvgl_p.a +OLD_FILES+=usr/lib/libvmmapi_p.a +OLD_FILES+=usr/lib/libwind_p.a +OLD_FILES+=usr/lib/libwrap_p.a +OLD_FILES+=usr/lib/libxo_p.a +OLD_FILES+=usr/lib/liby_p.a +OLD_FILES+=usr/lib/libypclnt_p.a +OLD_FILES+=usr/lib/libz_p.a +OLD_FILES+=usr/lib/libzfs_core_p.a +OLD_FILES+=usr/lib/libzfs_p.a +OLD_FILES+=usr/lib/libzfsbootenv_p.a +OLD_FILES+=usr/lib/libzutil_p.a + # 20241112: move p9fs from section 5 to section 4 OLD_FILES+=usr/share/man/man5/p9fs.5.gz diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 4c8285eedb2d..a73c9754ebbb 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -283,9 +283,6 @@ CFLAGS.gcc+= -fms-extensions LIBADD= md pthread z spl icp nvpair avl umem -# atomic.S doesn't like profiling. -MK_PROFILE= no - CSTD= c99 # Since there are many asserts in this library, it makes no sense to compile diff --git a/lib/libc++experimental/Makefile b/lib/libc++experimental/Makefile index 733bb8946900..02551645ca74 100644 --- a/lib/libc++experimental/Makefile +++ b/lib/libc++experimental/Makefile @@ -5,7 +5,6 @@ SRCDIR= ${SRCTOP}/contrib/llvm-project/libcxx LIB= c++experimental NO_PIC= -MK_PROFILE= no .PATH: ${SRCDIR}/src diff --git a/lib/libc_nonshared/Makefile b/lib/libc_nonshared/Makefile index 840dc3b8c291..90c3b756b0a5 100644 --- a/lib/libc_nonshared/Makefile +++ b/lib/libc_nonshared/Makefile @@ -2,7 +2,6 @@ # It is used exclusively with libc.so.* - there is no need for any other # compile modes. # bsd.lib.mk doesn't have an easy way to express that. -MK_PROFILE?=no .include NO_PIC= # -fpic on some platforms, -fPIC on others. diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc index e351d6ebef9d..c472e8b741be 100644 --- a/lib/libclang_rt/Makefile.inc +++ b/lib/libclang_rt/Makefile.inc @@ -10,7 +10,6 @@ LIBDIR= ${SANITIZER_LIBDIR} SHLIBDIR= ${LIBDIR} NO_PIC= -MK_PROFILE= no MK_ASAN:= no MK_SSP= no MK_UBSAN:= no diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile index 3543ce5728d7..08467bbec310 100644 --- a/lib/libcompiler_rt/Makefile +++ b/lib/libcompiler_rt/Makefile @@ -40,8 +40,5 @@ ${lse_name}: lse.S .if ${MK_INSTALLLIB} != "no" SYMLINKS+= libcompiler_rt.a ${LIBDIR}/libgcc.a .endif -.if ${MK_PROFILE} != "no" -SYMLINKS+= libcompiler_rt_p.a ${LIBDIR}/libgcc_p.a -.endif .include diff --git a/lib/libiconv_modules/Makefile.inc b/lib/libiconv_modules/Makefile.inc index ba2ccb0dd270..196f3bde8b32 100644 --- a/lib/libiconv_modules/Makefile.inc +++ b/lib/libiconv_modules/Makefile.inc @@ -7,4 +7,3 @@ CFLAGS+= -Dbool=_Bool SHLIBDIR= /usr/lib${COMPAT_libcompat:U}/i18n LIBDIR= ${SHLIBDIR} -MK_PROFILE= no diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile index f7108252b974..9bd855f60ed8 100644 --- a/lib/libpam/libpam/Makefile +++ b/lib/libpam/libpam/Makefile @@ -44,8 +44,6 @@ SHLIB= pam PACKAGE= runtime -MK_PROFILE=no - SRCS= openpam_asprintf.c \ openpam_borrow_cred.c \ openpam_check_owner_perms.c \ diff --git a/lib/libpam/modules/Makefile.inc b/lib/libpam/modules/Makefile.inc index dc701f921077..2e66aec64f07 100644 --- a/lib/libpam/modules/Makefile.inc +++ b/lib/libpam/modules/Makefile.inc @@ -1,7 +1,6 @@ PAMDIR= ${SRCTOP}/contrib/openpam MK_INSTALLLIB= no -MK_PROFILE= no CFLAGS+= -I${PAMDIR}/include -I${SRCTOP}/lib/libpam diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile index d1b15b47eb83..229adc6015f7 100644 --- a/lib/libprocstat/Makefile +++ b/lib/libprocstat/Makefile @@ -64,8 +64,6 @@ zfs/zfs_defs.pico: .PHONY @cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.pico zfs/zfs_defs.pieo: .PHONY @cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.pieo -zfs/zfs_defs.po: .PHONY - @cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.po .endif .include diff --git a/lib/librpcsec_gss/Makefile b/lib/librpcsec_gss/Makefile index 9b04340c8eb0..a29d9780c1ab 100644 --- a/lib/librpcsec_gss/Makefile +++ b/lib/librpcsec_gss/Makefile @@ -11,7 +11,6 @@ SYMBOL_MAPS= ${.CURDIR}/Symbol.map CFLAGS+= -I${SRCTOP}/include CFLAGS+= -I${SRCTOP}/lib/libc_rpc -MK_PROFILE= no MAN= rpcsec_gss.3 MAN+= rpc_gss_seccreate.3 diff --git a/lib/libssp_nonshared/Makefile b/lib/libssp_nonshared/Makefile index 8bad8722a5b9..c156d0ae8007 100644 --- a/lib/libssp_nonshared/Makefile +++ b/lib/libssp_nonshared/Makefile @@ -1,7 +1,6 @@ PACKAGE= clibs LIB= ssp_nonshared NO_PIC= -MK_PROFILE= no SRCS= libssp_nonshared.c CFLAGS+= -fPIC diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile index 88ccecdeba29..19afa93f12be 100644 --- a/lib/libthr/Makefile +++ b/lib/libthr/Makefile @@ -91,9 +91,6 @@ SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a .if !defined(NO_PIC) SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so .endif -.if ${MK_PROFILE} != "no" -SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a -.endif HAS_TESTS= SUBDIR.${MK_TESTS}+= tests diff --git a/lib/libulog/Makefile b/lib/libulog/Makefile index 22138a09a9fa..af26b485bf18 100644 --- a/lib/libulog/Makefile +++ b/lib/libulog/Makefile @@ -28,8 +28,5 @@ SYMLINKS+=libulog.a ${LIBDIR}/libutempter.a .if !defined(NO_PIC) SYMLINKS+=libulog.so ${LIBDIR}/libutempter.so .endif -.if ${MK_PROFILE} != "no" -SYMLINKS+=libulog_p.a ${LIBDIR}/libutempter_p.a -.endif .include diff --git a/lib/ncurses/form/Makefile b/lib/ncurses/form/Makefile index aaa3be9f3c0f..d4774a5f51a8 100644 --- a/lib/ncurses/form/Makefile +++ b/lib/ncurses/form/Makefile @@ -166,9 +166,6 @@ SYMLINKS+= libformw.a ${LIBDIR}/libform.a .if !defined(NO_PIC) SYMLINKS+= libformw.so ${LIBDIR}/libform.so .endif -.if ${MK_PROFILE} != "no" -SYMLINKS+= libformw_p.a ${LIBDIR}/libform_p.a -.endif .include diff --git a/lib/ncurses/menu/Makefile b/lib/ncurses/menu/Makefile index 0864da644bdf..793ee60c3a3e 100644 --- a/lib/ncurses/menu/Makefile +++ b/lib/ncurses/menu/Makefile @@ -135,9 +135,6 @@ SYMLINKS+= libmenuw.a ${LIBDIR}/libmenu.a .if !defined(NO_PIC) SYMLINKS+= libmenuw.so ${LIBDIR}/libmenu.so .endif -.if ${MK_PROFILE} != "no" -SYMLINKS+= libmenuw_p.a ${LIBDIR}/libmenu_p.a -.endif .include diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile index ad3f20f5f72c..254f05a1e740 100644 --- a/lib/ncurses/ncurses/Makefile +++ b/lib/ncurses/ncurses/Makefile @@ -160,12 +160,6 @@ SYMLINKS+= libncursesw.so ${LIBDIR}/libcursesw.so SYMLINKS+= libncursesw.so ${LIBDIR}/libncurses.so SYMLINKS+= libncursesw.so ${LIBDIR}/libcurses.so .endif -.if ${MK_PROFILE} != "no" -SYMLINKS+= libncursesw_p.a ${LIBDIR}/libcursesw_p.a -# backward compat -SYMLINKS+= libncursesw_p.a ${LIBDIR}/libncurses_p.a -SYMLINKS+= libncursesw_p.a ${LIBDIR}/libcurses_p.a -.endif LIBADD+= tinfow SHLIB_LDSCRIPT= libncursesw.ldscript diff --git a/lib/ncurses/panel/Makefile b/lib/ncurses/panel/Makefile index 93b07bf9b7d6..a51129df42e3 100644 --- a/lib/ncurses/panel/Makefile +++ b/lib/ncurses/panel/Makefile @@ -62,9 +62,6 @@ SYMLINKS+= libpanelw.a ${LIBDIR}/libpanel.a .if !defined(NO_PIC) SYMLINKS+= libpanelw.so ${LIBDIR}/libpanel.so .endif -.if ${MK_PROFILE} != "no" -SYMLINKS+= libpanelw_p.a ${LIBDIR}/libpanel_p.a -.endif INCS= panel.h .include diff --git a/lib/ncurses/tinfo/Makefile b/lib/ncurses/tinfo/Makefile index ea06e7bec03f..e11d0e15245e 100644 --- a/lib/ncurses/tinfo/Makefile +++ b/lib/ncurses/tinfo/Makefile @@ -195,14 +195,6 @@ SYMLINKS+= libtinfow.so ${LIBDIR}/libtermcap.so SYMLINKS+= libtinfow.so ${LIBDIR}/libtermlib.so SYMLINKS+= libtinfow.so ${LIBDIR}/libtinfo.so .endif -.if ${MK_PROFILE} != "no" -SYMLINKS+= libtinfow_p.a ${LIBDIR}/libtermcapw_p.a -SYMLINKS+= libtinfow_p.a ${LIBDIR}/libtermlibw_p.a -# backward compat -SYMLINKS+= libtinfow_p.a ${LIBDIR}/libtermcap_p.a -SYMLINKS+= libtinfow_p.a ${LIBDIR}/libtermlib_p.a -SYMLINKS+= libtinfow_p.a ${LIBDIR}/libtinfo_p.a -.endif DOCSDIR= ${SHAREDIR}/doc/ncurses DOCS= ncurses-intro.html hackguide.html diff --git a/lib/ofed/complib/Makefile b/lib/ofed/complib/Makefile index e900bc2b9a3f..43019e6ba5e0 100644 --- a/lib/ofed/complib/Makefile +++ b/lib/ofed/complib/Makefile @@ -4,7 +4,6 @@ _spath= ${SRCTOP}/contrib/ofed/opensm/complib SHLIBDIR?= /usr/lib LIB= osmcomp SHLIB_MAJOR= 3 -MK_PROFILE= no SRCS= \ cl_complib.c \ diff --git a/lib/ofed/libbnxtre/Makefile b/lib/ofed/libbnxtre/Makefile index e78f2a93ba44..f73099a44915 100755 --- a/lib/ofed/libbnxtre/Makefile +++ b/lib/ofed/libbnxtre/Makefile @@ -4,7 +4,6 @@ SPATH= ${SRCTOP}/contrib/ofed/libbnxtre SHLIBDIR?= /lib LIB= bnxtre SHLIB_MAJOR= 1 -MK_PROFILE= no SRCS= main.c db.c memory.c verbs.c diff --git a/lib/ofed/libcxgb4/Makefile b/lib/ofed/libcxgb4/Makefile index da831be6ebba..7c50e47ceec7 100644 --- a/lib/ofed/libcxgb4/Makefile +++ b/lib/ofed/libcxgb4/Makefile @@ -4,7 +4,6 @@ _spath= ${SRCTOP}/contrib/ofed/libcxgb4 SHLIBDIR?= /usr/lib LIB= cxgb4 SHLIB_MAJOR= 1 -MK_PROFILE= no SRCS= \ cq.c \ diff --git a/lib/ofed/libibcm/Makefile b/lib/ofed/libibcm/Makefile index ba8c2e8adf11..04f124d06167 100644 --- a/lib/ofed/libibcm/Makefile +++ b/lib/ofed/libibcm/Makefile @@ -4,7 +4,6 @@ _spath= ${SRCTOP}/contrib/ofed/libibcm SHLIBDIR?= /usr/lib LIB= ibcm SHLIB_MAJOR= 1 -MK_PROFILE= no SRCS= cm.c LIBADD= ibverbs CFLAGS+= -I${_spath} diff --git a/lib/ofed/libibmad/Makefile b/lib/ofed/libibmad/Makefile index 985efda634f1..298bb7dffbfe 100644 --- a/lib/ofed/libibmad/Makefile +++ b/lib/ofed/libibmad/Makefile @@ -4,7 +4,6 @@ _spath= ${SRCTOP}/contrib/ofed/libibmad SHLIBDIR?= /usr/lib LIB= ibmad SHLIB_MAJOR= 5 -MK_PROFILE= no SRCS= \ bm.c \ diff --git a/lib/ofed/libibnetdisc/Makefile b/lib/ofed/libibnetdisc/Makefile index d471189cb7c9..d3e0dd92509a 100644 --- a/lib/ofed/libibnetdisc/Makefile +++ b/lib/ofed/libibnetdisc/Makefile @@ -6,7 +6,6 @@ _spath= ${SRCTOP}/contrib/ofed/libibnetdisc SHLIBDIR?= /usr/lib LIB_CXX= ibnetdisc SHLIB_MAJOR= 5 -MK_PROFILE= no SRCS= \ chassis.c \ diff --git a/lib/ofed/libibumad/Makefile b/lib/ofed/libibumad/Makefile index 7d12e5cfa388..46e69012ba72 100644 --- a/lib/ofed/libibumad/Makefile +++ b/lib/ofed/libibumad/Makefile @@ -4,7 +4,6 @@ _spath= ${SRCTOP}/contrib/ofed/libibumad SHLIBDIR?= /usr/lib LIB= ibumad SHLIB_MAJOR= 1 -MK_PROFILE= no SRCS= \ umad.c \ umad_str.c \ diff --git a/lib/ofed/libibverbs/Makefile b/lib/ofed/libibverbs/Makefile index d336c40363d2..96e90c6615e2 100644 --- a/lib/ofed/libibverbs/Makefile +++ b/lib/ofed/libibverbs/Makefile @@ -4,7 +4,6 @@ _spath= ${SRCTOP}/contrib/ofed/libibverbs LIB= ibverbs SHLIB_MAJOR= 1 SHLIBDIR?= /lib -MK_PROFILE= no VERSION_MAP= ${_spath}/libibverbs.map CFLAGS+= -I${_spath} diff --git a/lib/ofed/libirdma/Makefile b/lib/ofed/libirdma/Makefile index 349590672b44..6629e8c2d6aa 100644 --- a/lib/ofed/libirdma/Makefile +++ b/lib/ofed/libirdma/Makefile @@ -6,7 +6,6 @@ lin_inc=/usr/src/sys/compat/linuxkpi/common/include SHLIBDIR?= /lib LIB= irdma SHLIB_MAJOR= 1 -MK_PROFILE= no SRCS= \ irdma_umain.c \ diff --git a/lib/ofed/libmlx4/Makefile b/lib/ofed/libmlx4/Makefile index cd4dccb99168..1b1dd07dbc23 100644 --- a/lib/ofed/libmlx4/Makefile +++ b/lib/ofed/libmlx4/Makefile @@ -4,7 +4,6 @@ _spath= ${SRCTOP}/contrib/ofed/libmlx4 SHLIBDIR?= /usr/lib LIB= mlx4 SHLIB_MAJOR= 1 -MK_PROFILE= no SRCS= \ buf.c \ diff --git a/lib/ofed/libmlx5/Makefile b/lib/ofed/libmlx5/Makefile index 38700bb7b9ee..72981091bed8 100644 --- a/lib/ofed/libmlx5/Makefile +++ b/lib/ofed/libmlx5/Makefile @@ -4,7 +4,6 @@ _spath= ${SRCTOP}/contrib/ofed/libmlx5 SHLIBDIR?= /lib LIB= mlx5 SHLIB_MAJOR= 1 -MK_PROFILE= no SRCS= \ buf.c \ diff --git a/lib/ofed/libopensm/Makefile b/lib/ofed/libopensm/Makefile index 11179a758609..a7133064977b 100644 --- a/lib/ofed/libopensm/Makefile +++ b/lib/ofed/libopensm/Makefile @@ -4,7 +4,6 @@ _spath= ${SRCTOP}/contrib/ofed/opensm/opensm SHLIBDIR?= /usr/lib LIB= opensm SHLIB_MAJOR= 5 -MK_PROFILE= no SRCS= \ osm_log.c \ diff --git a/lib/ofed/librdmacm/Makefile b/lib/ofed/librdmacm/Makefile index 37b79d56513c..8c86bada22f9 100644 --- a/lib/ofed/librdmacm/Makefile +++ b/lib/ofed/librdmacm/Makefile @@ -4,7 +4,6 @@ _spath= ${SRCTOP}/contrib/ofed/librdmacm SHLIBDIR?= /usr/lib LIB= rdmacm SHLIB_MAJOR= 1 -MK_PROFILE= no CFLAGS+= -I${_spath} SRCS= \ diff --git a/lib/ofed/libvendor/Makefile b/lib/ofed/libvendor/Makefile index 8082a866e9fb..c78e9da07e5f 100644 --- a/lib/ofed/libvendor/Makefile +++ b/lib/ofed/libvendor/Makefile @@ -4,7 +4,6 @@ _spath= ${SRCTOP}/contrib/ofed/opensm/libvendor SHLIBDIR?= /usr/lib LIB= osmvendor SHLIB_MAJOR= 4 -MK_PROFILE= no SRCS= \ osm_vendor_ibumad.c \ diff --git a/release/Makefile b/release/Makefile index 85da63b0c49a..bd130082a9ce 100644 --- a/release/Makefile +++ b/release/Makefile @@ -165,7 +165,7 @@ disc1: packagesystem DESTDIR=${.OBJDIR}/${.TARGET} MK_AT=no \ MK_INSTALLLIB=no MK_MAIL=no \ ${_ALL_LIBCOMPATS:@v@MK_LIB$v=no@} \ - MK_TOOLCHAIN=no MK_PROFILE=no \ + MK_TOOLCHAIN=no \ MK_RESCUE=no MK_DICT=no \ MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no \ -DDB_FROM_SRC ) @@ -206,7 +206,7 @@ bootonly: packagesystem MK_GAMES=no \ MK_INSTALLLIB=no MK_MAIL=no \ ${_ALL_LIBCOMPATS:@v@MK_LIB$v=no@} \ - MK_TOOLCHAIN=no MK_PROFILE=no \ + MK_TOOLCHAIN=no \ MK_RESCUE=no MK_DICT=no \ MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no \ -DDB_FROM_SRC ) diff --git a/sbin/nvmecontrol/modules/Makefile.inc b/sbin/nvmecontrol/modules/Makefile.inc index d88927501437..030b488e44e0 100644 --- a/sbin/nvmecontrol/modules/Makefile.inc +++ b/sbin/nvmecontrol/modules/Makefile.inc @@ -2,7 +2,6 @@ PACKAGE=nvme-tools NVMECONTROLDIR= ${SRCTOP}/sbin/nvmecontrol MK_INSTALLLIB= no -MK_PROFILE= no CFLAGS+= -I${NVMECONTROLDIR} diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 6e288b9cd4ce..06afa8630a20 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -297,18 +297,6 @@ lib${LIB_PRIVATE}${LIB}${_STATICLIB_SUFFIX}.a: ${OBJS} ${STATICOBJS} .if !defined(INTERNALLIB) -.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) -_LIBS+= lib${LIB_PRIVATE}${LIB}_p.a -POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po} -DEPENDOBJS+= ${POBJS} -CLEANFILES+= ${POBJS} - -lib${LIB_PRIVATE}${LIB}_p.a: ${POBJS} - @${ECHO} building profiled ${LIB} library - @rm -f ${.TARGET} - ${AR} ${ARFLAGS} ${.TARGET} ${POBJS} ${ARADD} -.endif - .if defined(LLVM_LINK) lib${LIB_PRIVATE}${LIB}.bc: ${BCOBJS} ${LLVM_LINK} -o ${.TARGET} ${BCOBJS} @@ -495,10 +483,6 @@ _libinstall: .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}${_STATICLIB_SUFFIX}.a ${DESTDIR}${_LIBDIR}/ -.if ${MK_PROFILE} != "no" - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}_p.a ${DESTDIR}${_LIBDIR}/ -.endif .endif .if defined(SHLIB_NAME) ${INSTALL} ${TAG_ARGS} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index 136215a2db47..c05de9b079ce 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -78,7 +78,6 @@ __DEFAULT_NO_OPTIONS = \ CCACHE_BUILD \ CTF \ INSTALL_AS_USER \ - PROFILE \ RETPOLINE \ STALE_STAGED \ UBSAN \ diff --git a/stand/defs.mk b/stand/defs.mk index 0e84df0f4633..fa3c89a4c3cc 100644 --- a/stand/defs.mk +++ b/stand/defs.mk @@ -10,7 +10,6 @@ FORTIFY_SOURCE= 0 MK_CTF= no MK_SSP= no -MK_PROFILE= no MK_PIE= no MAN= .if !defined(PIC) diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile index f3ed985e14b9..d342af4ff9f9 100644 --- a/targets/pseudo/bootstrap-tools/Makefile +++ b/targets/pseudo/bootstrap-tools/Makefile @@ -47,7 +47,6 @@ BSARGS= DESTDIR= \ MK_CLANG_FULL=no \ MK_HTML=no \ MK_MAN=no \ - MK_PROFILE=no \ MK_RETPOLINE=no \ MK_SSP=no \ MK_TESTS=no \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index c03611c976a6..e326155b26a4 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -6850,190 +6850,6 @@ OLD_FILES+=usr/share/man/man8/ppp.8.gz OLD_FILES+=usr/share/man/man8/pppctl.8.gz .endif -.if ${MK_PROFILE} == no -OLD_FILES+=usr/lib/lib80211_p.a -OLD_FILES+=usr/lib/lib9p_p.a -OLD_FILES+=usr/lib/libBlocksRuntime_p.a -OLD_FILES+=usr/lib/libalias_dummy_p.a -OLD_FILES+=usr/lib/libalias_ftp_p.a -OLD_FILES+=usr/lib/libalias_irc_p.a -OLD_FILES+=usr/lib/libalias_nbt_p.a -OLD_FILES+=usr/lib/libalias_p.a -OLD_FILES+=usr/lib/libalias_pptp_p.a -OLD_FILES+=usr/lib/libalias_skinny_p.a -OLD_FILES+=usr/lib/libalias_smedia_p.a -OLD_FILES+=usr/lib/libarchive_p.a -OLD_FILES+=usr/lib/libasn1_p.a -OLD_FILES+=usr/lib/libauditd_p.a -OLD_FILES+=usr/lib/libavl_p.a -OLD_FILES+=usr/lib/libbe_p.a -OLD_FILES+=usr/lib/libbegemot_p.a -OLD_FILES+=usr/lib/libblacklist_p.a -OLD_FILES+=usr/lib/libbluetooth_p.a -OLD_FILES+=usr/lib/libbsdxml_p.a -OLD_FILES+=usr/lib/libbsm_p.a -OLD_FILES+=usr/lib/libbsnmp_p.a -OLD_FILES+=usr/lib/libbz2_p.a -OLD_FILES+=usr/lib/libc++_p.a -OLD_FILES+=usr/lib/libc_p.a -OLD_FILES+=usr/lib/libcalendar_p.a -OLD_FILES+=usr/lib/libcam_p.a -OLD_FILES+=usr/lib/libcom_err_p.a -OLD_FILES+=usr/lib/libcompat_p.a -OLD_FILES+=usr/lib/libcompiler_rt_p.a -OLD_FILES+=usr/lib/libcrypt_p.a -OLD_FILES+=usr/lib/libcrypto_p.a -OLD_FILES+=usr/lib/libctf_p.a -OLD_FILES+=usr/lib/libcurses_p.a -OLD_FILES+=usr/lib/libcursesw_p.a -OLD_FILES+=usr/lib/libcuse_p.a -OLD_FILES+=usr/lib/libcxxrt_p.a -OLD_FILES+=usr/lib/libdevctl_p.a -OLD_FILES+=usr/lib/libdevinfo_p.a -OLD_FILES+=usr/lib/libdevstat_p.a -OLD_FILES+=usr/lib/libdialog_p.a -OLD_FILES+=usr/lib/libdl_p.a -OLD_FILES+=usr/lib/libdpv_p.a -OLD_FILES+=usr/lib/libdtrace_p.a -OLD_FILES+=usr/lib/libdwarf_p.a -OLD_FILES+=usr/lib/libedit_p.a -OLD_FILES+=usr/lib/libefivar_p.a -OLD_FILES+=usr/lib/libelf_p.a -OLD_FILES+=usr/lib/libexecinfo_p.a -OLD_FILES+=usr/lib/libfetch_p.a -OLD_FILES+=usr/lib/libfigpar_p.a -OLD_FILES+=usr/lib/libfl_p.a -OLD_FILES+=usr/lib/libform_p.a -OLD_FILES+=usr/lib/libformw_p.a -OLD_FILES+=usr/lib/libgcc_eh_p.a -OLD_FILES+=usr/lib/libgcc_p.a -OLD_FILES+=usr/lib/libgeom_p.a -OLD_FILES+=usr/lib/libgpio_p.a -OLD_FILES+=usr/lib/libgssapi_krb5_p.a -OLD_FILES+=usr/lib/libgssapi_ntlm_p.a -OLD_FILES+=usr/lib/libgssapi_p.a -OLD_FILES+=usr/lib/libgssapi_spnego_p.a -OLD_FILES+=usr/lib/libhdb_p.a -OLD_FILES+=usr/lib/libheimbase_p.a -OLD_FILES+=usr/lib/libheimntlm_p.a -OLD_FILES+=usr/lib/libheimsqlite_p.a -OLD_FILES+=usr/lib/libhistory_p.a -OLD_FILES+=usr/lib/libhx509_p.a -OLD_FILES+=usr/lib/libicp_p.a -OLD_FILES+=usr/lib/libicp_rescue_p.a -OLD_FILES+=usr/lib/libipsec_p.a -OLD_FILES+=usr/lib/libipt_p.a -OLD_FILES+=usr/lib/libjail_p.a -OLD_FILES+=usr/lib/libkadm5clnt_p.a -OLD_FILES+=usr/lib/libkadm5srv_p.a -OLD_FILES+=usr/lib/libkafs5_p.a -OLD_FILES+=usr/lib/libkdc_p.a -OLD_FILES+=usr/lib/libkiconv_p.a -OLD_FILES+=usr/lib/libkrb5_p.a -OLD_FILES+=usr/lib/libkvm_p.a -OLD_FILES+=usr/lib/libl_p.a -OLD_FILES+=usr/lib/libln_p.a -OLD_FILES+=usr/lib/liblzma_p.a -OLD_FILES+=usr/lib/libm_p.a -OLD_FILES+=usr/lib/libmagic_p.a -OLD_FILES+=usr/lib/libmd_p.a -OLD_FILES+=usr/lib/libmemstat_p.a -OLD_FILES+=usr/lib/libmenu_p.a -OLD_FILES+=usr/lib/libmenuw_p.a -OLD_FILES+=usr/lib/libmilter_p.a -OLD_FILES+=usr/lib/libmp_p.a -OLD_FILES+=usr/lib/libmt_p.a -OLD_FILES+=usr/lib/libncurses_p.a -OLD_FILES+=usr/lib/libncursesw_p.a -OLD_FILES+=usr/lib/libnetgraph_p.a -OLD_FILES+=usr/lib/libnetmap_p.a -OLD_FILES+=usr/lib/libnss_tacplus_p.a -OLD_FILES+=usr/lib/libnv_p.a -OLD_FILES+=usr/lib/libnvpair_p.a -OLD_FILES+=usr/lib/libopencsd_p.a -OLD_FILES+=usr/lib/libopie_p.a -OLD_FILES+=usr/lib/libpanel_p.a -OLD_FILES+=usr/lib/libpanelw_p.a -OLD_FILES+=usr/lib/libpathconv_p.a -OLD_FILES+=usr/lib/libpcap_p.a -OLD_FILES+=usr/lib/libpjdlog_p.a -OLD_FILES+=usr/lib/libpmc_p.a -OLD_FILES+=usr/lib/libprivateatf-c++_p.a -OLD_FILES+=usr/lib/libprivateatf-c_p.a -OLD_FILES+=usr/lib/libprivateauditd_p.a -OLD_FILES+=usr/lib/libprivatebsdstat_p.a -OLD_FILES+=usr/lib/libprivatecbor_p.a -OLD_FILES+=usr/lib/libprivatedevdctl_p.a -OLD_FILES+=usr/lib/libprivateevent_p.a -OLD_FILES+=usr/lib/libprivateevent1_p.a -OLD_FILES+=usr/lib/libprivatefido2_p.a -OLD_FILES+=usr/lib/libprivategmock_main_p.a -OLD_FILES+=usr/lib/libprivategmock_p.a -OLD_FILES+=usr/lib/libprivategtest_main_p.a -OLD_FILES+=usr/lib/libprivategtest_p.a -OLD_FILES+=usr/lib/libprivateheimipcc_p.a -OLD_FILES+=usr/lib/libprivateheimipcs_p.a -OLD_FILES+=usr/lib/libprivateifconfig_p.a -OLD_FILES+=usr/lib/libprivateldns_p.a -OLD_FILES+=usr/lib/libprivatesqlite3_p.a -OLD_FILES+=usr/lib/libprivatessh_p.a -OLD_FILES+=usr/lib/libprivateucl_p.a -OLD_FILES+=usr/lib/libprivateunbound_p.a -OLD_FILES+=usr/lib/libprivatezstd_p.a -OLD_FILES+=usr/lib/libproc_p.a -OLD_FILES+=usr/lib/libprocstat_p.a -OLD_FILES+=usr/lib/libpthread_p.a -OLD_FILES+=usr/lib/libradius_p.a -OLD_FILES+=usr/lib/libregex_p.a -OLD_FILES+=usr/lib/libroken_p.a -OLD_FILES+=usr/lib/librpcsvc_p.a -OLD_FILES+=usr/lib/librss_p.a -OLD_FILES+=usr/lib/librt_p.a -OLD_FILES+=usr/lib/librtld_db_p.a -OLD_FILES+=usr/lib/libsbuf_p.a -OLD_FILES+=usr/lib/libsdp_p.a -OLD_FILES+=usr/lib/libsmb_p.a -OLD_FILES+=usr/lib/libspl_p.a -OLD_FILES+=usr/lib/libssl_p.a -OLD_FILES+=usr/lib/libstats_p.a -OLD_FILES+=usr/lib/libstdbuf_p.a -OLD_FILES+=usr/lib/libstdc++_p.a -OLD_FILES+=usr/lib/libstdthreads_p.a -OLD_FILES+=usr/lib/libsupc++_p.a -OLD_FILES+=usr/lib/libsysdecode_p.a -OLD_FILES+=usr/lib/libtacplus_p.a -OLD_FILES+=usr/lib/libtermcap_p.a -OLD_FILES+=usr/lib/libtermcapw_p.a -OLD_FILES+=usr/lib/libtermlib_p.a -OLD_FILES+=usr/lib/libtermlibw_p.a -OLD_FILES+=usr/lib/libthr_p.a -OLD_FILES+=usr/lib/libthread_db_p.a -OLD_FILES+=usr/lib/libtinfo_p.a -OLD_FILES+=usr/lib/libtinfow_p.a -OLD_FILES+=usr/lib/libtpool_p.a -OLD_FILES+=usr/lib/libufs_p.a -OLD_FILES+=usr/lib/libugidfw_p.a -OLD_FILES+=usr/lib/libulog_p.a -OLD_FILES+=usr/lib/libumem_p.a -OLD_FILES+=usr/lib/libusb_p.a -OLD_FILES+=usr/lib/libusbhid_p.a -OLD_FILES+=usr/lib/libutempter_p.a -OLD_FILES+=usr/lib/libutil_p.a -OLD_FILES+=usr/lib/libuutil_p.a -OLD_FILES+=usr/lib/libvgl_p.a -OLD_FILES+=usr/lib/libvmmapi_p.a -OLD_FILES+=usr/lib/libwind_p.a -OLD_FILES+=usr/lib/libwrap_p.a -OLD_FILES+=usr/lib/libxo_p.a -OLD_FILES+=usr/lib/liby_p.a -OLD_FILES+=usr/lib/libypclnt_p.a -OLD_FILES+=usr/lib/libz_p.a -OLD_FILES+=usr/lib/libzfs_core_p.a -OLD_FILES+=usr/lib/libzfs_p.a -OLD_FILES+=usr/lib/libzfsbootenv_p.a -OLD_FILES+=usr/lib/libzutil_p.a -.endif - .if ${MK_QUOTAS} == no OLD_FILES+=sbin/quotacheck OLD_FILES+=usr/bin/quota diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile index f3ea5c6a71ff..3586f94a8957 100644 --- a/usr.bin/lex/lib/Makefile +++ b/usr.bin/lex/lib/Makefile @@ -11,10 +11,5 @@ LINKS= ${LIBDIR}/libln.a ${LIBDIR}/libl.a LINKS+= ${LIBDIR}/libln.a ${LIBDIR}/libfl.a .endif -.if ${MK_PROFILE} != "no" -LINKS+= ${LIBDIR}/libln_p.a ${LIBDIR}/libl_p.a -LINKS+= ${LIBDIR}/libln_p.a ${LIBDIR}/libfl_p.a -.endif - .include