Date: Fri, 26 Jul 2002 17:48:34 +0100 From: Tony Finch <dot@dotat.at> To: freebsd-ports@freebsd.org Cc: dot@dotat.at Subject: Re: permissions problems with patch-libtool Message-ID: <20020726174834.E7551@chiark.greenend.org.uk> In-Reply-To: <20020726174016.D7551@chiark.greenend.org.uk>; from dot@dotat.at on Fri, Jul 26, 2002 at 05:40:16PM %2B0100 References: <20020726174016.D7551@chiark.greenend.org.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Jul 26, 2002 at 05:40:16PM +0100, Tony Finch wrote:
> If any of ${LIBTOOLFILES} is read-only then patch-libtool will fail.
> Shall I commit this fix?
No, it's broken. One of these is better...
--- bsd.port.mk.orig Fri Jul 26 16:37:47 2002
+++ bsd.port.mk Fri Jul 26 16:46:07 2002
@@ -2641,6 +2641,7 @@
LIBTOOLDIR=`${WHICH} ${LIBTOOL} | ${SED} -e 's^/bin/libtool^/share/libtool^'` || ${LOCALBASE}/share/libtool; \
cd ${PATCH_WRKSRC}; \
for file in ${LIBTOOLFILES}; do \
+ ${CHMOD} u+w $$file; \
${CP} $$file $$file.tmp; \
${SED} -e "s^\$$ac_aux_dir/ltconfig^$${LIBTOOLDIR}/ltconfig^g" \
-e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} $${LIBTOOLDIR}/ltmain.sh^g" \
or
--- bsd.port.mk.orig Fri Jul 26 16:37:47 2002
+++ bsd.port.mk Fri Jul 26 16:44:41 2002
@@ -1047,7 +1047,7 @@
.endif
# Special macro for doing in-place file editing using regexps
-.if defined(USE_REINPLACE)
+.if defined(USE_REINPLACE) || defined(USE_LIBTOOL)
REINPLACE_ARGS?= -i.bak
.if ${OSVERSION} < 460101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500036 )
BUILD_DEPENDS+= ${LOCALBASE}/bin/sed_inplace:${PORTSDIR}/textproc/sed_inplace
@@ -2641,10 +2641,9 @@
LIBTOOLDIR=`${WHICH} ${LIBTOOL} | ${SED} -e 's^/bin/libtool^/share/libtool^'` || ${LOCALBASE}/share/libtool; \
cd ${PATCH_WRKSRC}; \
for file in ${LIBTOOLFILES}; do \
- ${CP} $$file $$file.tmp; \
- ${SED} -e "s^\$$ac_aux_dir/ltconfig^$${LIBTOOLDIR}/ltconfig^g" \
+ ${REINPLACE_CMD} -e "s^\$$ac_aux_dir/ltconfig^$${LIBTOOLDIR}/ltconfig^g" \
-e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} $${LIBTOOLDIR}/ltmain.sh^g" \
- $$file.tmp > $$file; \
+ $$file; \
done);
.else
@${DO_NADA}
Tony.
--
f.a.n.finch <dot@dotat.at> http://dotat.at/
WIGHT PORTLAND PLYMOUTH BISCAY: VARIABLE 3. FAIR. MODERATE WITH FOG PATCHES.
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020726174834.E7551>