svn commit: r287977 - head/libexec/rtld-elf

Bryan Drewery bdrewery at FreeBSD.org
Fri Sep 18 23:12:39 UTC 2015


Author: bdrewery
Date: Fri Sep 18 23:12:38 2015
New Revision: 287977
URL: https://svnweb.freebsd.org/changeset/base/287977

Log:
  META_MODE: No need to fix the link in this case.
  
  The exists(${DESTDIR}...) check runs with DESTDIR being blank.  When the
  target runs it does have DESTDIR=${STAGE_OBJTOP} via bsd.sys.mk.  This
  results in the first execution warning that the symlink is missing.  The
  second run does run fine.  However, this chflags is not needed at all
  for META_MODE/STAGING since we never had this path being a schg file
  while using META_MODE.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/libexec/rtld-elf/Makefile

Modified: head/libexec/rtld-elf/Makefile
==============================================================================
--- head/libexec/rtld-elf/Makefile	Fri Sep 18 22:55:18 2015	(r287976)
+++ head/libexec/rtld-elf/Makefile	Fri Sep 18 23:12:38 2015	(r287977)
@@ -77,7 +77,7 @@ SYMBOL_MAPS+=	${.CURDIR}/${RTLD_ARCH}/Sy
 # Since moving rtld-elf to /libexec, we need to create a symlink.
 # Fixup the existing binary that's there so we can symlink over it.
 beforeinstall:
-.if exists(${DESTDIR}/usr/libexec/${PROG})
+.if exists(${DESTDIR}/usr/libexec/${PROG}) && ${MK_STAGING} == "no"
 	-chflags -h noschg ${DESTDIR}/usr/libexec/${PROG}
 .endif
 


More information about the svn-src-head mailing list