From owner-svn-src-head@FreeBSD.ORG Fri Apr 25 19:25:32 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2AAA11A2; Fri, 25 Apr 2014 19:25:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EF28A1C59; Fri, 25 Apr 2014 19:25:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3PJPVNc098522; Fri, 25 Apr 2014 19:25:31 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3PJPQbt098490; Fri, 25 Apr 2014 19:25:26 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201404251925.s3PJPQbt098490@svn.freebsd.org> From: Warner Losh Date: Fri, 25 Apr 2014 19:25:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r264928 - in head: . cddl/lib/libzpool contrib/ofed/usr.lib/libibcm contrib/ofed/usr.lib/libibcommon contrib/ofed/usr.lib/libibmad contrib/ofed/usr.lib/libibumad contrib/ofed/usr.lib/li... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Apr 2014 19:25:32 -0000 Author: imp Date: Fri Apr 25 19:25:26 2014 New Revision: 264928 URL: http://svnweb.freebsd.org/changeset/base/264928 Log: Spell NO_PROFILE= as MK_PROFILE=no. Modified: head/Makefile.inc1 head/cddl/lib/libzpool/Makefile head/contrib/ofed/usr.lib/libibcm/Makefile head/contrib/ofed/usr.lib/libibcommon/Makefile head/contrib/ofed/usr.lib/libibmad/Makefile head/contrib/ofed/usr.lib/libibumad/Makefile head/contrib/ofed/usr.lib/libibverbs/Makefile head/contrib/ofed/usr.lib/libmlx4/Makefile head/contrib/ofed/usr.lib/libmthca/Makefile head/contrib/ofed/usr.lib/libopensm/Makefile head/contrib/ofed/usr.lib/libosmcomp/Makefile head/contrib/ofed/usr.lib/libosmvendor/Makefile head/contrib/ofed/usr.lib/librdmacm/Makefile head/contrib/ofed/usr.lib/libsdp/Makefile head/gnu/lib/libgcov/Makefile head/gnu/lib/libssp/Makefile head/gnu/lib/libssp/libssp_nonshared/Makefile head/lib/libc_nonshared/Makefile head/lib/libiconv_modules/Makefile.inc head/lib/libpam/libpam/Makefile head/lib/libpam/modules/Makefile.inc head/lib/librpcsec_gss/Makefile head/lib/libstand/Makefile head/sys/boot/libstand32/Makefile head/sys/boot/userboot/libstand/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Fri Apr 25 19:25:18 2014 (r264927) +++ head/Makefile.inc1 Fri Apr 25 19:25:26 2014 (r264928) @@ -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} MAKEOB 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} Modified: head/cddl/lib/libzpool/Makefile ============================================================================== --- head/cddl/lib/libzpool/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/cddl/lib/libzpool/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -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 Modified: head/contrib/ofed/usr.lib/libibcm/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/libibcm/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/contrib/ofed/usr.lib/libibcm/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -12,7 +12,7 @@ IBSRCDIR= ${IBCMDIR}/src LIB= ibcm SHLIB_MAJOR= 1 -NO_PROFILE= +MK_PROFILE= no SRCS= cm.c CFLAGS+= -I ${IBCMDIR}/include Modified: head/contrib/ofed/usr.lib/libibcommon/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/libibcommon/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/contrib/ofed/usr.lib/libibcommon/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -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 Modified: head/contrib/ofed/usr.lib/libibmad/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/libibmad/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/contrib/ofed/usr.lib/libibmad/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -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 Modified: head/contrib/ofed/usr.lib/libibumad/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/libibumad/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/contrib/ofed/usr.lib/libibumad/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -11,7 +11,7 @@ IBSRCDIR= ${UMADDIR}/src LIB= ibumad SHLIB_MAJOR= 1 -NO_PROFILE= +MK_PROFILE= no SRCS= umad.c Modified: head/contrib/ofed/usr.lib/libibverbs/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/libibverbs/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/contrib/ofed/usr.lib/libibverbs/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -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 Modified: head/contrib/ofed/usr.lib/libmlx4/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/libmlx4/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/contrib/ofed/usr.lib/libmlx4/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -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 Modified: head/contrib/ofed/usr.lib/libmthca/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/libmthca/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/contrib/ofed/usr.lib/libmthca/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -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 Modified: head/contrib/ofed/usr.lib/libopensm/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/libopensm/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/contrib/ofed/usr.lib/libopensm/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -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 Modified: head/contrib/ofed/usr.lib/libosmcomp/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/libosmcomp/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/contrib/ofed/usr.lib/libosmcomp/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -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 Modified: head/contrib/ofed/usr.lib/libosmvendor/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/libosmvendor/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/contrib/ofed/usr.lib/libosmvendor/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -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 Modified: head/contrib/ofed/usr.lib/librdmacm/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/librdmacm/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/contrib/ofed/usr.lib/librdmacm/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -12,7 +12,7 @@ RDMAMANDIR= ${RDMACMDIR}/man LIB= rdmacm SHLIB_MAJOR= 1 -NO_PROFILE= +MK_PROFILE= no SRCS= cma.c Modified: head/contrib/ofed/usr.lib/libsdp/Makefile ============================================================================== --- head/contrib/ofed/usr.lib/libsdp/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/contrib/ofed/usr.lib/libsdp/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -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 Modified: head/gnu/lib/libgcov/Makefile ============================================================================== --- head/gnu/lib/libgcov/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/gnu/lib/libgcov/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -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 Modified: head/gnu/lib/libssp/Makefile ============================================================================== --- head/gnu/lib/libssp/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/gnu/lib/libssp/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -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 \ Modified: head/gnu/lib/libssp/libssp_nonshared/Makefile ============================================================================== --- head/gnu/lib/libssp/libssp_nonshared/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/gnu/lib/libssp/libssp_nonshared/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -7,7 +7,7 @@ GCCLIB= ${.CURDIR}/../../../../contrib/g LIB= ssp_nonshared NO_PIC= -NO_PROFILE= +MK_PROFILE=no SRCS= ssp-local.c Modified: head/lib/libc_nonshared/Makefile ============================================================================== --- head/lib/libc_nonshared/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/lib/libc_nonshared/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -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. Modified: head/lib/libiconv_modules/Makefile.inc ============================================================================== --- head/lib/libiconv_modules/Makefile.inc Fri Apr 25 19:25:18 2014 (r264927) +++ head/lib/libiconv_modules/Makefile.inc Fri Apr 25 19:25:26 2014 (r264928) @@ -14,4 +14,4 @@ SHLIBDIR= /usr/lib/i18n SHLIBDIR= /usr/lib32/i18n .endif LIBDIR= ${SHLIBDIR} -NO_PROFILE= +MK_PROFILE= no Modified: head/lib/libpam/libpam/Makefile ============================================================================== --- head/lib/libpam/libpam/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/lib/libpam/libpam/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -39,7 +39,7 @@ OPENPAM= ${.CURDIR}/../../../contrib/ope .PATH: ${OPENPAM}/include ${OPENPAM}/lib/libpam ${OPENPAM}/doc/man LIB= pam -NO_PROFILE= +MK_PROFILE=no SRCS= openpam_asprintf.c \ openpam_borrow_cred.c \ Modified: head/lib/libpam/modules/Makefile.inc ============================================================================== --- head/lib/libpam/modules/Makefile.inc Fri Apr 25 19:25:18 2014 (r264927) +++ head/lib/libpam/modules/Makefile.inc Fri Apr 25 19:25:26 2014 (r264928) @@ -3,7 +3,7 @@ PAMDIR= ${.CURDIR}/../../../../contrib/openpam MK_INSTALLLIB= no -NO_PROFILE= +MK_PROFILE= no CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam Modified: head/lib/librpcsec_gss/Makefile ============================================================================== --- head/lib/librpcsec_gss/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/lib/librpcsec_gss/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -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 Modified: head/lib/libstand/Makefile ============================================================================== --- head/lib/libstand/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/lib/libstand/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -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 Modified: head/sys/boot/libstand32/Makefile ============================================================================== --- head/sys/boot/libstand32/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/sys/boot/libstand32/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -16,7 +16,7 @@ S= ${.CURDIR}/../../../lib/libstand .PATH: ${S} LIB= stand INTERNALLIB= -NO_PROFILE= +MK_PROFILE= no NO_PIC= WARNS?= 0 Modified: head/sys/boot/userboot/libstand/Makefile ============================================================================== --- head/sys/boot/userboot/libstand/Makefile Fri Apr 25 19:25:18 2014 (r264927) +++ head/sys/boot/userboot/libstand/Makefile Fri Apr 25 19:25:26 2014 (r264928) @@ -16,7 +16,7 @@ S= ${.CURDIR}/../../../../lib/libstand .PATH: ${S} LIB= stand INTERNALLIB= -NO_PROFILE= +MK_PROFILE= no NO_PIC= WARNS?= 0