Date: Sun, 11 Oct 2015 16:14:05 +0200 From: Wolfgang Jenkner <wjenkner@inode.at> To: Koop Mast <kwm@FreeBSD.org> Cc: marino@FreeBSD.org, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r399021 - in head: graphics/dri graphics/libGL lang/clover Message-ID: <857fmtjxqo.fsf@iznogoud.viz> References: <201510102104.t9AL4iur039809@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Oct 10 2015, Koop Mast wrote:
> * Sed on 11 and 10 supports \< and \> however sed on 9.x and dragonfly do not,
> replace the sed keywords with some magic to get the intended results. [2]
>
[...]
> Modified: head/graphics/libGL/Makefile.targets
> ==============================================================================
> --- head/graphics/libGL/Makefile.targets Sat Oct 10 20:53:34 2015 (r399020)
> +++ head/graphics/libGL/Makefile.targets Sat Oct 10 21:04:44 2015 (r399021)
> @@ -3,7 +3,9 @@
> # this file holds common targets
>
> post-patch:
> +# Sed on 9.x and dragonfly don't support \< or \>
> @${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \
> + -e "/\>\/\// s|/-|/ -|; s|\\\>||" \
> -e 's|python2 python|python2disabled pythondisabled|g' \
> ${WRKSRC}/configure
> @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
>
This "magic" is not quite correct nor is it needed:
After `make patch', `diff -u configure.orig configure' contains the
following hunk
@@ -13036,8 +13045,8 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
- (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+ (eval $archive_cmds 2\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
So the redirection 2>&1 has been mangled (due to the fact that the
address in the sed command was probably meant to have a grouping
'{ ... }' around the following two substitutions). There's another
similar case between 9071-9080.
However, I think the following patch should work for all versions of BSD
sed, see re_format(7).
-- >8 --
Subject: [PATCH] Use standard BSD word-end anchor in sed regexp.
---
graphics/libGL/Makefile.targets | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/graphics/libGL/Makefile.targets b/graphics/libGL/Makefile.targets
index 43dbc91..ed79b5d 100644
--- a/graphics/libGL/Makefile.targets
+++ b/graphics/libGL/Makefile.targets
@@ -5,7 +5,7 @@
post-patch:
# Sed on 9.x and dragonfly don't support \< or \>
@${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \
- -e "/\>\/\// s|/-|/ -|; s|\\\>||" \
+ -e 's|\\>//|[[:>:]]//|' \
-e 's|python2 python|python2disabled pythondisabled|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
--
2.6.1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?857fmtjxqo.fsf>