Date: Wed, 18 Nov 2015 21:37:46 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291026 - in head: . usr.bin/xinstall Message-ID: <201511182137.tAILbko6071382@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Nov 18 21:37:46 2015 New Revision: 291026 URL: https://svnweb.freebsd.org/changeset/base/291026 Log: Remove unneeded libmd from bootstrap-tools (reverting r246784). The bootstrap-tools are supposed to be host tools, which in most cases, use host headers and libraries. As such, directly including the src tree's headers for libmd here causes the need to link libmd in since it will be built with the new symbols (which /usr/lib/libmd.so) won't have unless it is new enough. During the target build in buildworld the target headers are staged into WORLDTMP and used via --sysroot, allowing the target xinstall to be built with the new/target libmd. The .PATH here was also not doing anything since xinstall does not use libmd source files. Sponsored by: EMC / Isilon Storage Division MFC after: 2 weeks Modified: head/Makefile.inc1 head/usr.bin/xinstall/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Wed Nov 18 21:09:03 2015 (r291025) +++ head/Makefile.inc1 Wed Nov 18 21:37:46 2015 (r291026) @@ -1458,9 +1458,6 @@ ${_bt}-usr.bin/mandoc: ${_bt}-lib/libope _makewhatis=usr.bin/makewhatis .endif -# Rebuild up-to-date libmd for xinstall -${_bt}-usr.bin/xinstall: ${_bt}-lib/libmd - bootstrap-tools: .PHONY # Please document (add comment) why something is in 'bootstrap-tools'. @@ -1483,7 +1480,6 @@ bootstrap-tools: .PHONY ${_yacc} \ ${_m4} \ ${_lex} \ - lib/libmd \ usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ Modified: head/usr.bin/xinstall/Makefile ============================================================================== --- head/usr.bin/xinstall/Makefile Wed Nov 18 21:09:03 2015 (r291025) +++ head/usr.bin/xinstall/Makefile Wed Nov 18 21:37:46 2015 (r291026) @@ -7,10 +7,8 @@ SRCS= xinstall.c getid.c MAN= install.1 .PATH: ${.CURDIR}/../../contrib/mtree -.PATH: ${.CURDIR}/../../lib/libmd CFLAGS+= -I${.CURDIR}/../../contrib/mtree CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd -CFLAGS+= -I${.CURDIR}/../../lib/libmd LIBADD= md
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511182137.tAILbko6071382>