From 98407b8bc2a44f4c665fa343496bd22ac1556700 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Fri, 25 Apr 2014 19:25:26 +0000 Subject: [PATCH] Spell NO_PROFILE= as MK_PROFILE=no. --- Makefile.inc1 | 12 ++++++------ cddl/lib/libzpool/Makefile | 2 +- contrib/ofed/usr.lib/libibcm/Makefile | 2 +- contrib/ofed/usr.lib/libibcommon/Makefile | 2 +- contrib/ofed/usr.lib/libibmad/Makefile | 2 +- contrib/ofed/usr.lib/libibumad/Makefile | 2 +- contrib/ofed/usr.lib/libibverbs/Makefile | 2 +- contrib/ofed/usr.lib/libmlx4/Makefile | 2 +- contrib/ofed/usr.lib/libmthca/Makefile | 2 +- contrib/ofed/usr.lib/libopensm/Makefile | 2 +- contrib/ofed/usr.lib/libosmcomp/Makefile | 2 +- contrib/ofed/usr.lib/libosmvendor/Makefile | 2 +- contrib/ofed/usr.lib/librdmacm/Makefile | 2 +- contrib/ofed/usr.lib/libsdp/Makefile | 2 +- gnu/lib/libgcov/Makefile | 5 +++-- gnu/lib/libssp/Makefile | 5 +++-- gnu/lib/libssp/libssp_nonshared/Makefile | 2 +- lib/libc_nonshared/Makefile | 2 +- lib/libiconv_modules/Makefile.inc | 2 +- lib/libpam/libpam/Makefile | 2 +- lib/libpam/modules/Makefile.inc | 2 +- lib/librpcsec_gss/Makefile | 2 +- lib/libstand/Makefile | 5 +++-- sys/boot/libstand32/Makefile | 2 +- sys/boot/userboot/libstand/Makefile | 2 +- 25 files changed, 36 insertions(+), 33 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index f1a1e8641349..affd36f0b417 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -247,7 +247,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ BOOTSTRAPPING=${OSRELDATE} \ SSP_CFLAGS= \ MK_HTML=no MK_INFO=no NO_LINT=yes MK_MAN=no \ - -DNO_PIC -DNO_PROFILE -DNO_SHARED \ + -DNO_PIC MK_PROFILE=no -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WARNS MK_CTF=no -DEARLY_BUILD MK_TESTS=no # build-tools stage @@ -276,7 +276,7 @@ KTMAKE= TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \ BOOTSTRAPPING=${OSRELDATE} \ SSP_CFLAGS= \ MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \ - -DNO_PIC -DNO_PROFILE -DNO_SHARED \ + -DNO_PIC MK_PROFILE=no -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WARNS MK_CTF=no -DEARLY_BUILD # world stage @@ -557,7 +557,7 @@ _libraries: @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; \ ${WMAKE} -DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \ - -DNO_PROFILE MK_TESTS=no libraries + MK_PROFILE=no MK_TESTS=no libraries _depend: @echo @echo "--------------------------------------------------------------" @@ -1602,9 +1602,9 @@ ${_lib}__PL: .PHONY .MAKE cd ${.CURDIR}/${_lib} && \ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj && \ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend && \ - ${MAKE} MK_TESTS=no -DNO_PROFILE -DNO_PIC \ + ${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \ DIRPRFX=${_lib}/ all && \ - ${MAKE} MK_TESTS=no -DNO_PROFILE -DNO_PIC \ + ${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \ DIRPRFX=${_lib}/ install .endif .endfor @@ -1858,7 +1858,7 @@ XDEV_CPUTYPE?=${TARGET_CPUTYPE} .endif NOFUN=-DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT \ - MK_MAN=no MK_NLS=no -DNO_PROFILE \ + MK_MAN=no MK_NLS=no MK_PROFILE=no \ MK_KERBEROS=no MK_RESCUE=no MK_TESTS=no -DNO_WARNS \ TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \ CPUTYPE=${XDEV_CPUTYPE} diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 848325aff849..7d4528f6aafa 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -60,7 +60,7 @@ DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} LDADD= -lmd -lpthread -lz # atomic.S doesn't like profiling. -NO_PROFILE= +MK_PROFILE= no CSTD= c99 diff --git a/contrib/ofed/usr.lib/libibcm/Makefile b/contrib/ofed/usr.lib/libibcm/Makefile index fd9db835c34f..1e22dbedc156 100644 --- a/contrib/ofed/usr.lib/libibcm/Makefile +++ b/contrib/ofed/usr.lib/libibcm/Makefile @@ -12,7 +12,7 @@ IBSRCDIR= ${IBCMDIR}/src LIB= ibcm SHLIB_MAJOR= 1 -NO_PROFILE= +MK_PROFILE= no SRCS= cm.c CFLAGS+= -I ${IBCMDIR}/include diff --git a/contrib/ofed/usr.lib/libibcommon/Makefile b/contrib/ofed/usr.lib/libibcommon/Makefile index 7153ca10c362..daa1f42e78ff 100644 --- a/contrib/ofed/usr.lib/libibcommon/Makefile +++ b/contrib/ofed/usr.lib/libibcommon/Makefile @@ -11,7 +11,7 @@ IBSRCDIR= ${IBCOMMONDIR}/src LIB= ibcommon SHLIB_MAJOR= 1 -NO_PROFILE= +MK_PROFILE= no SRCS= sysfs.c util.c hash.c stack.c time.c diff --git a/contrib/ofed/usr.lib/libibmad/Makefile b/contrib/ofed/usr.lib/libibmad/Makefile index 2fbb274fbd03..43c66c356314 100644 --- a/contrib/ofed/usr.lib/libibmad/Makefile +++ b/contrib/ofed/usr.lib/libibmad/Makefile @@ -11,7 +11,7 @@ IBSRCDIR= ${IBMADDIR}/src LIB= ibmad SHLIB_MAJOR= 1 -NO_PROFILE= +MK_PROFILE= no SRCS= dump.c fields.c gs.c mad.c portid.c register.c resolve.c rpc.c sa.c \ serv.c smp.c vendor.c diff --git a/contrib/ofed/usr.lib/libibumad/Makefile b/contrib/ofed/usr.lib/libibumad/Makefile index 2e2e258ba9d4..b420b1c7fb2b 100644 --- a/contrib/ofed/usr.lib/libibumad/Makefile +++ b/contrib/ofed/usr.lib/libibumad/Makefile @@ -11,7 +11,7 @@ IBSRCDIR= ${UMADDIR}/src LIB= ibumad SHLIB_MAJOR= 1 -NO_PROFILE= +MK_PROFILE= no SRCS= umad.c diff --git a/contrib/ofed/usr.lib/libibverbs/Makefile b/contrib/ofed/usr.lib/libibverbs/Makefile index 8f45174d76d9..b8f73ba1646b 100644 --- a/contrib/ofed/usr.lib/libibverbs/Makefile +++ b/contrib/ofed/usr.lib/libibverbs/Makefile @@ -12,7 +12,7 @@ IBMANDIR= ${IBVERBSDIR}/man LIB= ibverbs SHLIB_MAJOR= 1 -NO_PROFILE= +MK_PROFILE= no SRCS= device.c init.c marshall.c verbs.c cmd.c enum_strs.c kern_abi.h \ memory.c compat-1_0.c sysfs.c diff --git a/contrib/ofed/usr.lib/libmlx4/Makefile b/contrib/ofed/usr.lib/libmlx4/Makefile index 0710a8ab832c..9959ec922961 100644 --- a/contrib/ofed/usr.lib/libmlx4/Makefile +++ b/contrib/ofed/usr.lib/libmlx4/Makefile @@ -12,7 +12,7 @@ MLXSRCDIR= ${MLX4DIR}/src LIB= mlx4 SHLIB_MAJOR= 1 -NO_PROFILE= +MK_PROFILE= no SRCS= buf.c cq.c dbrec.c mlx4.c qp.c srq.c verbs.c diff --git a/contrib/ofed/usr.lib/libmthca/Makefile b/contrib/ofed/usr.lib/libmthca/Makefile index 525b0b6bf7d7..4d0c6072725a 100644 --- a/contrib/ofed/usr.lib/libmthca/Makefile +++ b/contrib/ofed/usr.lib/libmthca/Makefile @@ -12,7 +12,7 @@ MTHCASRCDIR= ${MTHCADIR}/src LIB= mthca SHLIB_MAJOR= 1 -NO_PROFILE= +MK_PROFILE= no SRCS= ah.c buf.c cq.c memfree.c mthca.c qp.c srq.c verbs.c diff --git a/contrib/ofed/usr.lib/libopensm/Makefile b/contrib/ofed/usr.lib/libopensm/Makefile index 63f64191ec05..7d2a5247f9e0 100644 --- a/contrib/ofed/usr.lib/libopensm/Makefile +++ b/contrib/ofed/usr.lib/libopensm/Makefile @@ -9,7 +9,7 @@ SHLIBDIR?= /usr/lib LIB= opensm SHLIB_MAJOR= 1 -NO_PROFILE= +MK_PROFILE= no SRCS= osm_log.c osm_mad_pool.c osm_helper.c diff --git a/contrib/ofed/usr.lib/libosmcomp/Makefile b/contrib/ofed/usr.lib/libosmcomp/Makefile index be53800bb754..373e9beed4e6 100644 --- a/contrib/ofed/usr.lib/libosmcomp/Makefile +++ b/contrib/ofed/usr.lib/libosmcomp/Makefile @@ -9,7 +9,7 @@ SHLIBDIR?= /usr/lib LIB= osmcomp SHLIB_MAJOR= 1 -NO_PROFILE= +MK_PROFILE= no SRCS= cl_complib.c cl_dispatcher.c cl_event.c cl_event_wheel.c cl_list.c SRCS+= cl_log.c cl_map.c cl_pool.c cl_ptr_vector.c cl_spinlock.c diff --git a/contrib/ofed/usr.lib/libosmvendor/Makefile b/contrib/ofed/usr.lib/libosmvendor/Makefile index f45d821f4c05..62cd8daffe7d 100644 --- a/contrib/ofed/usr.lib/libosmvendor/Makefile +++ b/contrib/ofed/usr.lib/libosmvendor/Makefile @@ -9,7 +9,7 @@ SHLIBDIR?= /usr/lib LIB= osmvendor SHLIB_MAJOR= 1 -NO_PROFILE= +MK_PROFILE= no SRCS= osm_vendor_ibumad.c osm_vendor_ibumad_sa.c diff --git a/contrib/ofed/usr.lib/librdmacm/Makefile b/contrib/ofed/usr.lib/librdmacm/Makefile index e171ce8089ac..560931f7529c 100644 --- a/contrib/ofed/usr.lib/librdmacm/Makefile +++ b/contrib/ofed/usr.lib/librdmacm/Makefile @@ -12,7 +12,7 @@ RDMAMANDIR= ${RDMACMDIR}/man LIB= rdmacm SHLIB_MAJOR= 1 -NO_PROFILE= +MK_PROFILE= no SRCS= cma.c diff --git a/contrib/ofed/usr.lib/libsdp/Makefile b/contrib/ofed/usr.lib/libsdp/Makefile index 7886284619d5..cae08f98e690 100644 --- a/contrib/ofed/usr.lib/libsdp/Makefile +++ b/contrib/ofed/usr.lib/libsdp/Makefile @@ -10,7 +10,7 @@ SDPDIR= ${.CURDIR}/../../libsdp/src LIB= ibsdp SHLIB_MAJOR= 1 -NO_PROFILE= +MK_PROFILE= no MAN= SRCS= log.c match.c port.c config_parser.c config_scanner.c diff --git a/gnu/lib/libgcov/Makefile b/gnu/lib/libgcov/Makefile index dbefca28cc9a..aab624105291 100644 --- a/gnu/lib/libgcov/Makefile +++ b/gnu/lib/libgcov/Makefile @@ -1,8 +1,9 @@ # $FreeBSD$ -NO_PROFILE= -.include +MK_PROFILE= no MK_SSP= no + +.include .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" GCCDIR= ${.CURDIR}/../../../contrib/gcc diff --git a/gnu/lib/libssp/Makefile b/gnu/lib/libssp/Makefile index 641874c17289..6e8977169bb3 100644 --- a/gnu/lib/libssp/Makefile +++ b/gnu/lib/libssp/Makefile @@ -2,9 +2,11 @@ SHLIBDIR?= /lib -.include +MK_PROFILE= no MK_SSP= no +.include + GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs SRCDIR= ${GCCLIB}/libssp @@ -13,7 +15,6 @@ SRCDIR= ${GCCLIB}/libssp LIB= ssp SHLIB_MAJOR= 0 -NO_PROFILE= SRCS= ssp.c gets-chk.c memcpy-chk.c memmove-chk.c mempcpy-chk.c \ memset-chk.c snprintf-chk.c sprintf-chk.c stpcpy-chk.c \ diff --git a/gnu/lib/libssp/libssp_nonshared/Makefile b/gnu/lib/libssp/libssp_nonshared/Makefile index 94544951fdfd..b8b6fcf18823 100644 --- a/gnu/lib/libssp/libssp_nonshared/Makefile +++ b/gnu/lib/libssp/libssp_nonshared/Makefile @@ -7,7 +7,7 @@ GCCLIB= ${.CURDIR}/../../../../contrib/gcclibs LIB= ssp_nonshared NO_PIC= -NO_PROFILE= +MK_PROFILE=no SRCS= ssp-local.c diff --git a/lib/libc_nonshared/Makefile b/lib/libc_nonshared/Makefile index 4c2a94588a86..e65fca06f8b6 100644 --- a/lib/libc_nonshared/Makefile +++ b/lib/libc_nonshared/Makefile @@ -4,7 +4,7 @@ # 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. -NO_PROFILE?= +MK_PROFILE?=no .include NO_PIC= # -fpic on some platforms, -fPIC on others. diff --git a/lib/libiconv_modules/Makefile.inc b/lib/libiconv_modules/Makefile.inc index 3b25374b91e5..51ae7184fbbe 100644 --- a/lib/libiconv_modules/Makefile.inc +++ b/lib/libiconv_modules/Makefile.inc @@ -14,4 +14,4 @@ SHLIBDIR= /usr/lib/i18n SHLIBDIR= /usr/lib32/i18n .endif LIBDIR= ${SHLIBDIR} -NO_PROFILE= +MK_PROFILE= no diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile index 0d81f183d5f0..7b6c9adba76b 100644 --- a/lib/libpam/libpam/Makefile +++ b/lib/libpam/libpam/Makefile @@ -39,7 +39,7 @@ OPENPAM= ${.CURDIR}/../../../contrib/openpam .PATH: ${OPENPAM}/include ${OPENPAM}/lib/libpam ${OPENPAM}/doc/man LIB= pam -NO_PROFILE= +MK_PROFILE=no SRCS= openpam_asprintf.c \ openpam_borrow_cred.c \ diff --git a/lib/libpam/modules/Makefile.inc b/lib/libpam/modules/Makefile.inc index d42d91b1b444..085ab58475d2 100644 --- a/lib/libpam/modules/Makefile.inc +++ b/lib/libpam/modules/Makefile.inc @@ -3,7 +3,7 @@ PAMDIR= ${.CURDIR}/../../../../contrib/openpam MK_INSTALLLIB= no -NO_PROFILE= +MK_PROFILE= no CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam diff --git a/lib/librpcsec_gss/Makefile b/lib/librpcsec_gss/Makefile index cc14a7b41731..67a79635cc0d 100644 --- a/lib/librpcsec_gss/Makefile +++ b/lib/librpcsec_gss/Makefile @@ -13,7 +13,7 @@ SYMBOL_MAPS= ${.CURDIR}/Symbol.map CFLAGS+= -I${.CURDIR}/../../include CFLAGS+= -I${.CURDIR}/../../libc_rpc -NO_PROFILE= +MK_PROFILE= no MAN= rpcsec_gss.3 MAN+= rpc_gss_seccreate.3 diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile index 359fa4af430d..5f645203597a 100644 --- a/lib/libstand/Makefile +++ b/lib/libstand/Makefile @@ -6,11 +6,12 @@ # quite large. # -.include +MK_PROFILE= no MK_SSP= no +.include + LIB= stand -NO_PROFILE= NO_PIC= INCS= stand.h MAN= libstand.3 diff --git a/sys/boot/libstand32/Makefile b/sys/boot/libstand32/Makefile index a364980a7c64..fd60d60f2f1b 100644 --- a/sys/boot/libstand32/Makefile +++ b/sys/boot/libstand32/Makefile @@ -16,7 +16,7 @@ S= ${.CURDIR}/../../../lib/libstand .PATH: ${S} LIB= stand INTERNALLIB= -NO_PROFILE= +MK_PROFILE= no NO_PIC= WARNS?= 0 diff --git a/sys/boot/userboot/libstand/Makefile b/sys/boot/userboot/libstand/Makefile index 4ef62f34d99b..042b6a36a5ea 100644 --- a/sys/boot/userboot/libstand/Makefile +++ b/sys/boot/userboot/libstand/Makefile @@ -16,7 +16,7 @@ S= ${.CURDIR}/../../../../lib/libstand .PATH: ${S} LIB= stand INTERNALLIB= -NO_PROFILE= +MK_PROFILE= no NO_PIC= WARNS?= 0