Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 16 Feb 2015 07:56:48 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r379071 - head/Mk/Uses
Message-ID:  <201502160756.t1G7um6h071055@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Mon Feb 16 07:56:47 2015
New Revision: 379071
URL: https://svnweb.freebsd.org/changeset/ports/379071
QAT: https://qat.redports.org/buildarchive/r379071/

Log:
  Don't use the default backup suffix
  
  Rename backup file in order to avoid conflict with default suffix as
  used by REINPLACE_CMD in post-patch. This facilitates reviewing
  changes done by each step after the build.
  
  PR:		197502
  Exp-run by:	antoine
  Approved by:	autotools (tijl, maintainer)
  Approved by:	portmgr (antoine)
  Approved by:	mentors (implicit)

Modified:
  head/Mk/Uses/libtool.mk

Modified: head/Mk/Uses/libtool.mk
==============================================================================
--- head/Mk/Uses/libtool.mk	Mon Feb 16 07:53:56 2015	(r379070)
+++ head/Mk/Uses/libtool.mk	Mon Feb 16 07:56:47 2015	(r379071)
@@ -27,7 +27,7 @@ _INCLUDE_USES_LIBTOOL_POST_MK=	yes
 
 patch-libtool:
 	@${FIND} ${WRKDIR} \( -name configure -or -name ltconfig \)	\
-		-type f | while read i; do ${SED} -i.bak		\
+		-type f | while read i; do ${SED} -i.libtool.bak	\
 		-e '/dragonfly\*/!s/^ *freebsd\*[ )]/dragonfly* | &/'	\
 		-e '/gcc_dir=\\`/s/gcc /$$CC /'				\
 		-e '/gcc_ver=\\`/s/gcc /$$CC /'				\
@@ -44,7 +44,7 @@ patch-libtool:
 			\$$libname\$$release\$$shared_ext\$$major	\
 			\$$libname\$$shared_ext'			\
 		    soname_spec='\$$libname\$$release\$$shared_ext\$$major'/; \
-		    }" $${i} && ${TOUCH} -mr $${i}.bak $${i}; done
+		    }" $${i} && ${TOUCH} -mr $${i}.libtool.bak $${i}; done
 
 	@${FIND} ${WRKDIR} -type f -name ltmain.sh |			\
 		${XARGS} ${REINPLACE_CMD}				\



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502160756.t1G7um6h071055>