Date: Sat, 21 Aug 2010 17:29:59 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r211577 - in head: . cddl/lib/drti lib/libelf Message-ID: <201008211729.o7LHTxjY076184@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rpaulo Date: Sat Aug 21 17:29:59 2010 New Revision: 211577 URL: http://svn.freebsd.org/changeset/base/211577 Log: Don't link drti.o with libelf_pic.a. This means that all software with userland SDT probes must be linked with libelf explicitly. Requested by: kib Sponsored by: The FreeBSD Foundation Modified: head/Makefile.inc1 head/cddl/lib/drti/Makefile head/lib/libelf/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sat Aug 21 17:15:37 2010 (r211576) +++ head/Makefile.inc1 Sat Aug 21 17:29:59 2010 (r211577) @@ -1149,7 +1149,7 @@ gnu/lib/libgcc__L: lib/libc__L _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libheimntlm} \ ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ - lib/libbz2 lib/libcom_err lib/libcrypt lib/libelf \ + lib/libbz2 lib/libcom_err lib/libcrypt \ lib/libexpat lib/libfetch \ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/liblzma lib/libmd \ Modified: head/cddl/lib/drti/Makefile ============================================================================== --- head/cddl/lib/drti/Makefile Sat Aug 21 17:15:37 2010 (r211576) +++ head/cddl/lib/drti/Makefile Sat Aug 21 17:29:59 2010 (r211577) @@ -8,7 +8,7 @@ FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESMODE= ${LIBMODE} FILESDIR= ${LIBDIR}/dtrace -CLEANFILES= ${FILES} ${FILES}.tmp +CLEANFILES= ${FILES} CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ @@ -18,10 +18,4 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ -DPIC -fpic -.c.o: - ${CC} ${CFLAGS} -c ${.IMPSRC} - mv ${FILES} ${FILES}.tmp - ${LD} -o ${FILES} -r ${FILES}.tmp ${LIBELF_PIC} - rm -f ${FILES}.tmp - .include <bsd.prog.mk> Modified: head/lib/libelf/Makefile ============================================================================== --- head/lib/libelf/Makefile Sat Aug 21 17:15:37 2010 (r211576) +++ head/lib/libelf/Makefile Sat Aug 21 17:29:59 2010 (r211577) @@ -55,7 +55,6 @@ SRCS= elf_begin.c \ ${GENSRCS} INCS= libelf.h gelf.h -INSTALL_PIC_ARCHIVE=yes GENSRCS= libelf_fsize.c libelf_msize.c libelf_convert.c CLEANFILES= ${GENSRCS} CFLAGS+= -I. -I${.CURDIR}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008211729.o7LHTxjY076184>