Author: brooks
Date: Tue Apr 30 22:13:55 2013
New Revision: 250121
URL: http://svnweb.freebsd.org/changeset/base/250121
Log:
MFC r245752,246913,247162,250119
Replace all known uses of ln in the build process with appropriate
install -l invocations via new INSTALL_LINK and INSTALL_SYMLINK
variables.
Sponsored by: DARPA, AFRL
Modified:
stable/9/UPDATING (contents, props changed)
stable/9/etc/Makefile
stable/9/share/mk/bsd.incs.mk
stable/9/share/mk/bsd.info.mk
stable/9/share/mk/bsd.lib.mk
stable/9/share/mk/bsd.links.mk
stable/9/share/mk/bsd.man.mk
stable/9/share/mk/bsd.own.mk
Directory Properties:
stable/9/etc/ (props changed)
stable/9/share/mk/ (props changed)
Modified: stable/9/UPDATING
==============================================================================
--- stable/9/UPDATING Tue Apr 30 21:36:52 2013 (r250120)
+++ stable/9/UPDATING Tue Apr 30 22:13:55 2013 (r250121)
@@ -21,6 +21,13 @@ Items affecting the ports and packages s
This can be accomplished with the command (cd src/usr.sbin/mergemaster
&& make install).
+ Due to the use of the new -l option to install(1) during build
+ and install, you must take care not to directly set the INSTALL
+ make variable in your /etc/make.conf, /etc/src.conf, or on the
+ command line. If you with to use the -C flag for all installs
+ you may be able to add INSTALL+=-C to /etc/make.conf or
+ /etc/src.conf.
+
20130429:
Fix a bug that allows NFS clients to issue READDIR on files.
Modified: stable/9/etc/Makefile
==============================================================================
--- stable/9/etc/Makefile Tue Apr 30 21:36:52 2013 (r250120)
+++ stable/9/etc/Makefile Tue Apr 30 22:13:55 2013 (r250121)
@@ -321,26 +321,29 @@ distrib-dirs:
-f $$m -p $$d; \
${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \
done; true
- ln -sfh usr/src/sys ${DESTDIR}/sys
+ ${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys
cd ${DESTDIR}/usr/share/man; \
for mandir in man*; do \
- ln -sfh ../$$mandir ${DESTDIR}/usr/share/man/en.ISO8859-1/; \
- ln -sfh ../$$mandir ${DESTDIR}/usr/share/man/en.UTF-8/; \
+ ${INSTALL_SYMLINK} ../$$mandir \
+ ${DESTDIR}/usr/share/man/en.ISO8859-1/; \
+ ${INSTALL_SYMLINK} ../$$mandir \
+ ${DESTDIR}/usr/share/man/en.UTF-8/; \
done
cd ${DESTDIR}/usr/share/openssl/man; \
for mandir in man*; do \
- ln -sfh ../$$mandir \
+ ${INSTALL_SYMLINK} ../$$mandir \
${DESTDIR}/usr/share/openssl/man/en.ISO8859-1/; \
done
set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \
while [ $$# -gt 0 ] ; do \
- ln -sfh "$$2" "${DESTDIR}/usr/share/man/$$1"; \
- ln -sfh "$$2" "${DESTDIR}/usr/share/openssl/man/$$1"; \
+ ${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/man/$$1"; \
+ ${INSTALL_SYMLINK} "$$2" \
+ "${DESTDIR}/usr/share/openssl/man/$$1"; \
shift; shift; \
done
set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \
while [ $$# -gt 0 ] ; do \
- ln -sfh "$$2" "${DESTDIR}/usr/share/nls/$$1"; \
+ ${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/nls/$$1"; \
shift; shift; \
done
Modified: stable/9/share/mk/bsd.incs.mk
==============================================================================
--- stable/9/share/mk/bsd.incs.mk Tue Apr 30 21:36:52 2013
(r250120)
+++ stable/9/share/mk/bsd.incs.mk Tue Apr 30 22:13:55 2013
(r250121)
@@ -73,7 +73,7 @@ installincludes:
t=${DESTDIR}$$1; \
shift; \
${ECHO} $$t -\> $$l; \
- ln -fs $$l $$t; \
+ ${INSTALL_SYMLINK} $$l $$t; \
done; true
.endif
.endif # !target(installincludes)
Modified: stable/9/share/mk/bsd.info.mk
==============================================================================
--- stable/9/share/mk/bsd.info.mk Tue Apr 30 21:36:52 2013
(r250120)
+++ stable/9/share/mk/bsd.info.mk Tue Apr 30 22:13:55 2013
(r250121)
@@ -113,7 +113,7 @@ DVIPS2ASCII?= dvips2ascii
.info.html:
${INFO2HTML} ${.IMPSRC}
- ln -f ${.TARGET:R}.info.Top.html ${.TARGET}
+ ${INSTALL_LINK} ${.TARGET:R}.info.Top.html ${.TARGET}
.PATH: ${.CURDIR} ${SRCDIR}
Modified: stable/9/share/mk/bsd.lib.mk
==============================================================================
--- stable/9/share/mk/bsd.lib.mk Tue Apr 30 21:36:52 2013
(r250120)
+++ stable/9/share/mk/bsd.lib.mk Tue Apr 30 22:13:55 2013
(r250121)
@@ -180,7 +180,7 @@ ${SHLIB_NAME}: ${SOBJS}
@${ECHO} building shared library ${SHLIB_NAME}
@rm -f ${.TARGET} ${SHLIB_LINK}
.if defined(SHLIB_LINK)
- @ln -fs ${.TARGET} ${SHLIB_LINK}
+ @${INSTALL_SYMLINK} ${SHLIB_NAME} ${SHLIB_LINK}
.endif
.if !defined(NM)
@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
@@ -291,9 +291,9 @@ _libinstall:
${_INSTALLFLAGS} lib${LIB}.ld ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
.else
.if ${SHLIBDIR} == ${LIBDIR}
- ln -fs ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
+ ${INSTALL_SYMLINK} ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
.else
- ln -fs ${_SHLIBDIRPREFIX}${SHLIBDIR}/${SHLIB_NAME} \
+ ${INSTALL_SYMLINK} ${_SHLIBDIRPREFIX}${SHLIBDIR}/${SHLIB_NAME} \
${DESTDIR}${LIBDIR}/${SHLIB_LINK}
.if exists(${DESTDIR}${LIBDIR}/${SHLIB_NAME})
-chflags noschg ${DESTDIR}${LIBDIR}/${SHLIB_NAME}
Modified: stable/9/share/mk/bsd.links.mk
==============================================================================
--- stable/9/share/mk/bsd.links.mk Tue Apr 30 21:36:52 2013
(r250120)
+++ stable/9/share/mk/bsd.links.mk Tue Apr 30 22:13:55 2013
(r250121)
@@ -15,7 +15,7 @@ _installlinks:
t=${DESTDIR}$$1; \
shift; \
${ECHO} $$t -\> $$l; \
- ln -f $$l $$t; \
+ ${INSTALL_LINK} $$l $$t; \
done; true
.endif
.if defined(SYMLINKS) && !empty(SYMLINKS)
@@ -26,6 +26,6 @@ _installlinks:
t=${DESTDIR}$$1; \
shift; \
${ECHO} $$t -\> $$l; \
- ln -fs $$l $$t; \
+ ${INSTALL_SYMLINK} $$l $$t; \
done; true
.endif
Modified: stable/9/share/mk/bsd.man.mk
==============================================================================
--- stable/9/share/mk/bsd.man.mk Tue Apr 30 21:36:52 2013
(r250120)
+++ stable/9/share/mk/bsd.man.mk Tue Apr 30 22:13:55 2013
(r250121)
@@ -216,7 +216,7 @@ _maninstall: ${MAN}
t=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \
${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
rm -f $${t} $${t}${MCOMPRESS_EXT}; \
- ln $${l}${ZEXT} $${t}${ZEXT}; \
+ ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \
done
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
@set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \
@@ -231,7 +231,7 @@ _maninstall: ${MAN}
t=${DESTDIR}${CATDIR}$${sect}${MANSUBDIR}/$$name; \
${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
rm -f $${t} $${t}${MCOMPRESS_EXT}; \
- ln $${l}${ZEXT} $${t}${ZEXT}; \
+ ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \
done
.endif
.endif
Modified: stable/9/share/mk/bsd.own.mk
==============================================================================
--- stable/9/share/mk/bsd.own.mk Tue Apr 30 21:36:52 2013
(r250120)
+++ stable/9/share/mk/bsd.own.mk Tue Apr 30 22:13:55 2013
(r250121)
@@ -181,6 +181,15 @@ NLSMODE?= ${NOBINMODE}
INCLUDEDIR?= /usr/include
+#
+# install(1) parameters.
+#
+HRDLINK?= -l h
+SYMLINK?= -l s
+
+INSTALL_LINK?= ${INSTALL} ${HRDLINK}
+INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK}
+
# Common variables
.if !defined(DEBUG_FLAGS)
STRIP?= -s
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
