Date: Thu, 17 Jan 2013 17:27:10 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r245561 - in head: . cddl/lib/libdtrace share/mk Message-ID: <201301171727.r0HHRBEs028180@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Thu Jan 17 17:27:10 2013 New Revision: 245561 URL: http://svnweb.freebsd.org/changeset/base/245561 Log: Add a new LIBRARIES_ONLY make variable to disable the build and install of files other than the actual libraries. Use LIBRARIES_ONLY to supress the inclusion of files in the lib32 distribution that are duplicates of files in base. Sponsored by: DARPA, AFRL Reviewed by: emaste Modified: head/Makefile.inc1 head/cddl/lib/libdtrace/Makefile head/share/mk/bsd.README head/share/mk/bsd.lib.mk Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Thu Jan 17 17:12:44 2013 (r245560) +++ head/Makefile.inc1 Thu Jan 17 17:27:10 2013 (r245561) @@ -336,6 +336,7 @@ LIB32WMAKEFLAGS+= \ CXX="${CXX} ${LIB32FLAGS}" \ DESTDIR=${LIB32TMP} \ -DCOMPAT_32BIT \ + -DLIBRARIES_ONLY \ -DNO_CPU_CFLAGS \ -DNO_CTF \ -DNO_LINT Modified: head/cddl/lib/libdtrace/Makefile ============================================================================== --- head/cddl/lib/libdtrace/Makefile Thu Jan 17 17:12:44 2013 (r245560) +++ head/cddl/lib/libdtrace/Makefile Thu Jan 17 17:27:10 2013 (r245561) @@ -103,7 +103,7 @@ dt_names.c: beforedepend: dt_errtags.c dt_names.c beforeinstall: -.if exists(${DESTDIR}/usr/lib/dtrace) +.if !defined(LIBRARIES_ONLY) && exists(${DESTDIR}/usr/lib/dtrace) .for file in ${DSRCS} ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} ${.CURDIR}/${file} ${DESTDIR}/usr/lib/dtrace .endfor Modified: head/share/mk/bsd.README ============================================================================== --- head/share/mk/bsd.README Thu Jan 17 17:12:44 2013 (r245560) +++ head/share/mk/bsd.README Thu Jan 17 17:27:10 2013 (r245561) @@ -356,6 +356,8 @@ SHLIB_LDSCRIPT Template file to generate Unless used, a simple symlink is created to the real shared object. +LIBRARIES_ONLY Do not build or install files other than the library. + The include file <bsd.lib.mk> includes the file named "../Makefile.inc" if it exists, as well as the include file <bsd.man.mk>. Modified: head/share/mk/bsd.lib.mk ============================================================================== --- head/share/mk/bsd.lib.mk Thu Jan 17 17:12:44 2013 (r245560) +++ head/share/mk/bsd.lib.mk Thu Jan 17 17:27:10 2013 (r245561) @@ -331,9 +331,12 @@ _libinstall: .endif .endif # !defined(INTERNALLIB) +.if !defined(LIBRARIES_ONLY) .include <bsd.nls.mk> .include <bsd.files.mk> .include <bsd.incs.mk> +.endif + .include <bsd.links.mk> .if ${MK_MAN} != "no" @@ -348,7 +351,7 @@ lint: ${SRCS:M*.c} ${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC} .endif -.if ${MK_MAN} != "no" +.if ${MK_MAN} != "no" && !defined(LIBRARIES_ONLY) .include <bsd.man.mk> .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301171727.r0HHRBEs028180>