Date: Sat, 11 Mar 2017 19:57:33 -0700 From: Ian Lepore <ian@freebsd.org> To: "Rodney W. Grimes" <rgrimes@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r315091 - head/share/termcap Message-ID: <1489287453.40576.75.camel@freebsd.org> In-Reply-To: <201703120037.v2C0bjdq045397@repo.freebsd.org> References: <201703120037.v2C0bjdq045397@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, 2017-03-12 at 00:37 +0000, Rodney W. Grimes wrote: > Author: rgrimes > Date: Sun Mar 12 00:37:45 2017 > New Revision: 315091 > URL: https://svnweb.freebsd.org/changeset/base/315091 > > Log: > Revert r314833 until the problem with INSTALL_RSYMLINKS can be > found > as it appears to break arm release builds. > > PR: 217705 > Reported by: cyclaero@gmail.com > Approved by: grehan (mentor) implict as reverting > > Modified: > head/share/termcap/Makefile > > Modified: head/share/termcap/Makefile > ===================================================================== > ========= > --- head/share/termcap/Makefile Sat Mar 11 22:34:02 2017 > (r315090) > +++ head/share/termcap/Makefile Sun Mar 12 00:37:45 2017 > (r315091) > @@ -24,6 +24,6 @@ termcap.db: termcap > cap_mkdb ${CAP_MKDB_ENDIAN} -f ${.TARGET:R} ${.ALLSRC} > > etc-termcap: > - ${INSTALL_RSYMLINK} ${BINDIR}/misc/termcap > ${DESTDIR}/etc/termcap > + ${INSTALL_SYMLINK} ${BINDIR}/misc/termcap > ${DESTDIR}/etc/termcap > > .include <bsd.prog.mk> > In an arm build sandbox I ran "make distribution DESTDIR=/tmp/ian" and this is what happened with termcap: --- etc-termcap --- install -l rs /usr/share/misc/termcap /tmp/ian/etc/termcap ... revolution > file /tmp/ian/etc/termcap /tmp/ian/etc/termcap: symbolic link to ../../../usr/share/misc/termcap Then I changed the rsymlink in share/termcap/Makefile to: ${INSTALL_RSYMLINK} ${DESTDIR}/${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap and it did the right thing: --- etc-termcap --- install -l rs /tmp/ian//usr/share/misc/termcap /tmp/ian/etc/termcap ... revolution > file /tmp/ian/etc/termcap /tmp/ian/etc/termcap: symbolic link to ../usr/share/misc/termcap I haven't thought hard about whether adding DESTDIR like that would always fix the problem the right way. -- Ian
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1489287453.40576.75.camel>