[vlc-devel] [PATCH] fribidi: fix bootstrap script

[Sean McGovern]

Hi Rafaël,

This did not fix my issue.

Originally, Solaris /bin/sh was crapping out on line 26 of bootstrap, with ' || unexpected'. My patch allows the build to complete successfully.

Now, after your patch, it is failing with 'autoreconf: automake failed with exit status: 1'.

-- Sean McG.
-----Original Message-----
From: Rafaël Carré <funman at videolan.org>
Sender: "vlc-devel" <vlc-devel-bounces at videolan.org>Date: Tue, 15 Jul 2014 10:55:48 
To: Mailing list for VLC media player developers<vlc-devel at videolan.org>
Reply-To: Mailing list for VLC media player developers <vlc-devel at videolan.org>
Subject: Re: [vlc-devel] [PATCH] fribidi: fix bootstrap script

Hi,

Should be fixed by calling autoreconf the simple way,
See ddb1bc746a7c2f30d0fb962575ac8ba631cb3450

On 07/15/14 05:51, Sean McGovern wrote:
> Non-POSIX shells need a little assistance to run this script
> properly.
> ---
>  contrib/src/fribidi/bootstrap_non-posix.patch |   16 ++++++++++++++++
>  contrib/src/fribidi/rules.mak                 |    1 +
>  2 files changed, 17 insertions(+)
>  create mode 100644 contrib/src/fribidi/bootstrap_non-posix.patch
> 
> diff --git a/contrib/src/fribidi/bootstrap_non-posix.patch b/contrib/src/fribidi/bootstrap_non-posix.patch
> new file mode 100644
> index 0000000..78eca15
> --- /dev/null
> +++ b/contrib/src/fribidi/bootstrap_non-posix.patch
> @@ -0,0 +1,16 @@
> +--- fribidi/bootstrap.ORIG	Sun Dec  2 11:25:39 2012
> ++++ fribidi/bootstrap	Mon Jul 14 23:41:35 2014
> +@@ -19,11 +19,11 @@
> + test -n "$DIR" && cd "$DIR"
> + 
> + if test "$1" = --write-configure; then
> +-	test -f configure && \
> ++	(test -f configure && \
> + 	((echo '#! /bin/sh
> + 	        DIR=`echo $0 | sed "s,[^/]*\$,,"`
> + 	        exec ${DIR}bootstrap --configure -- "$@"' > configure \
> +-	  && chmod a+x configure) || \
> ++	  && chmod a+x configure)) || \
> + 	 echo Failed writing to configure >&2)
> + 
> + 	exit $?
> diff --git a/contrib/src/fribidi/rules.mak b/contrib/src/fribidi/rules.mak
> index 30d1080..4127654 100644
> --- a/contrib/src/fribidi/rules.mak
> +++ b/contrib/src/fribidi/rules.mak
> @@ -16,6 +16,7 @@ fribidi: fribidi-$(FRIBIDI_VERSION).tar.bz2 .sum-fribidi
>  	$(UNPACK)
>  	$(APPLY) $(SRC)/fribidi/fribidi.patch
>  	$(APPLY) $(SRC)/fribidi/no-ansi.patch
> +	$(APPLY) $(SRC)/fribidi/bootstrap_non-posix.patch
>  	$(MOVE)
>  
>  # FIXME: DEPS_fribidi = iconv $(DEPS_iconv)
> 
_______________________________________________
vlc-devel mailing list
To unsubscribe or modify your subscription options:
https://mailman.videolan.org/listinfo/vlc-devel