d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't link drti.o with libelf_pic.a. This means that all software with

Browse Source 
userland SDT probes must be linked with libelf explicitly.

Requested by:	kib
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Rui Paulo 2010-08-21 17:29:59 +00:00
parent 2aedda247b
commit 029a737371
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=211577
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc1
View File

@ -1149,7 +1149,7 @@ gnu/lib/libgcc__L: lib/libc__L
_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libheimntlm} \ _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libheimntlm} \
${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
${_kerberos5_lib_libroken} \ ${_kerberos5_lib_libroken} \
lib/libbz2 lib/libcom_err lib/libcrypt lib/libelf \ lib/libbz2 lib/libcom_err lib/libcrypt \
lib/libexpat lib/libfetch \ lib/libexpat lib/libfetch \
${_lib_libgssapi} ${_lib_libipx} \ ${_lib_libgssapi} ${_lib_libipx} \
lib/libkiconv lib/libkvm lib/liblzma lib/libmd \ lib/libkiconv lib/libkvm lib/liblzma lib/libmd \

8
cddl/lib/drti/Makefile
View File

@ -8,7 +8,7 @@ FILESOWN= ${LIBOWN}
FILESGRP= ${LIBGRP} FILESGRP= ${LIBGRP}
FILESMODE= ${LIBMODE} FILESMODE= ${LIBMODE}
FILESDIR= ${LIBDIR}/dtrace FILESDIR= ${LIBDIR}/dtrace
CLEANFILES= ${FILES} ${FILES}.tmp CLEANFILES= ${FILES}
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
-I${.CURDIR}/../../../cddl/compat/opensolaris/include \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \
@ -18,10 +18,4 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
-I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
-DPIC -fpic -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> .include <bsd.prog.mk>

1
lib/libelf/Makefile
View File

@ -55,7 +55,6 @@ SRCS= elf_begin.c \
${GENSRCS} ${GENSRCS}
INCS= libelf.h gelf.h INCS= libelf.h gelf.h
INSTALL_PIC_ARCHIVE=yes
GENSRCS= libelf_fsize.c libelf_msize.c libelf_convert.c GENSRCS= libelf_fsize.c libelf_msize.c libelf_convert.c
CLEANFILES= ${GENSRCS} CLEANFILES= ${GENSRCS}
CFLAGS+= -I. -I${.CURDIR} CFLAGS+= -I. -I${.CURDIR}