svn commit: r250337 - head/cddl/lib/drti

Brooks Davis brooks at FreeBSD.org
Tue May 7 22:05:58 UTC 2013


Author: brooks
Date: Tue May  7 22:05:57 2013
New Revision: 250337
URL: http://svnweb.freebsd.org/changeset/base/250337

Log:
  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.
  
  MFC after:	3 days

Modified:
  head/cddl/lib/drti/Makefile

Modified: head/cddl/lib/drti/Makefile
==============================================================================
--- head/cddl/lib/drti/Makefile	Tue May  7 22:05:15 2013	(r250336)
+++ head/cddl/lib/drti/Makefile	Tue May  7 22:05:57 2013	(r250337)
@@ -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>


More information about the svn-src-head mailing list