Date: Sun, 12 May 2013 00:35:58 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250534 - stable/9/cddl/lib/drti Message-ID: <201305120035.r4C0Zw0H043272@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Sun May 12 00:35:57 2013 New Revision: 250534 URL: http://svnweb.freebsd.org/changeset/base/250534 Log: MFC r250337 Work around the implementation of LIBRARIES_ONLY. It causes drti.o to not be installed in /usr/lib32 on systems with compat-32 support. This fix has two parts. First, the build is forced by linking drti.o into a dummy internal library. Second, the object file is installed manually in the LIBRARIES_ONLY case. Modified: stable/9/cddl/lib/drti/Makefile Directory Properties: stable/9/cddl/lib/drti/ (props changed) Modified: stable/9/cddl/lib/drti/Makefile ============================================================================== --- stable/9/cddl/lib/drti/Makefile Sat May 11 23:55:43 2013 (r250533) +++ stable/9/cddl/lib/drti/Makefile Sun May 12 00:35:57 2013 (r250534) @@ -9,6 +9,8 @@ FILESGRP= ${LIBGRP} FILESMODE= ${LIBMODE} FILESDIR= ${LIBDIR}/dtrace CLEANFILES= ${FILES} +LIB= drti-dummy +INTERNALLIB= CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ @@ -18,4 +20,10 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ -DPIC ${PICFLAG} +.if make(install) && defined(LIBRARIES_ONLY) +install: + ${INSTALL} -o ${FILESOWN} -g ${FILESGRP} -m ${FILESMODE} \ + ${FILES} ${DESTDIR}${FILESDIR} +.endif + .include <bsd.lib.mk> _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305120035.r4C0Zw0H043272>