From owner-svn-src-head@freebsd.org Sun Mar 12 02:57:43 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 789ADD07082 for ; Sun, 12 Mar 2017 02:57:43 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound1a.eu.mailhop.org (outbound1a.eu.mailhop.org [52.58.109.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 161C01B98 for ; Sun, 12 Mar 2017 02:57:42 +0000 (UTC) (envelope-from ian@freebsd.org) X-MHO-User: a9973b53-06cf-11e7-95b5-6dfd7dbb0ee5 X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 73.78.92.27 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [73.78.92.27]) by outbound1.eu.mailhop.org (Halon) with ESMTPSA id a9973b53-06cf-11e7-95b5-6dfd7dbb0ee5; Sun, 12 Mar 2017 02:57:44 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id v2C2vXB9002472; Sat, 11 Mar 2017 19:57:33 -0700 (MST) (envelope-from ian@freebsd.org) Message-ID: <1489287453.40576.75.camel@freebsd.org> Subject: Re: svn commit: r315091 - head/share/termcap From: Ian Lepore To: "Rodney W. Grimes" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Sat, 11 Mar 2017 19:57:33 -0700 In-Reply-To: <201703120037.v2C0bjdq045397@repo.freebsd.org> References: <201703120037.v2C0bjdq045397@repo.freebsd.org> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.18.5.1 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Mar 2017 02:57:43 -0000 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 > 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