[vlc-devel] [PATCH] src: fix fourcc_gen build on OS/2

[Rémi Denis-Courmont]

Le samedi 01 août 2015, 17:12:38 KO Myung-Hun a écrit :
> ---
>  configure.ac                    |  4 ++++
>  extras/package/os2/configure.sh | 15 ++++++++++++++-
>  src/Makefile.am                 |  6 +++---
>  3 files changed, 21 insertions(+), 4 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index a3dc3e1..fc9dc28 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -317,6 +317,10 @@ case "${build_os}" in
>      cygwin|msys)
>          ac_executable_extensions=".exe"
>      ;;
> +    os2*)
> +        BUILDEXEEXT=".exe"
> +        AC_SUBST(BUILDEXEEXT)

Never call AC_SUBST conditionally.

> +    ;;
>      *)
>      ;;
>  esac
> diff --git a/extras/package/os2/configure.sh
> b/extras/package/os2/configure.sh index dc954ea..3b07f33 100644
> --- a/extras/package/os2/configure.sh
> +++ b/extras/package/os2/configure.sh
> @@ -45,4 +45,17 @@ export ARCHFLAGS=${ARCHFLAGS-"-march=i486"}
>  export CFLAGS="${CFLAGS} ${ARCHFLAGS}"
>  export CXXFLAGS="${CXXFLAGS} ${ARCHFLAGS}"
> 
> -sh "$(dirname $0)"/../../../configure ${OPTIONS} $*
> +# find a native gcc for BUILDCC
> +saved_IFS="$IFS"
> +IFS=";"
> +for dir in $PATH; do
> +    if test -f "$dir/gcc.exe"; then
> +        BUILDCC="$dir/gcc.exe -std=c99"
> +        break
> +    fi
> +done
> +IFS="$saved_IFS"
> +
> +export BUILDCC
> +
> +sh "$(dirname $0)"/../../../configure ${OPTIONS} "$@"

You should not need to resolve the path.

> diff --git a/src/Makefile.am b/src/Makefile.am
> index acebc34..61c65ac 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -512,13 +512,13 @@ SOURCES_libvlc = \
>  # FourCC tables
>  BUILT_SOURCES += fourcc_tables.h
>  EXTRA_DIST += misc/fourcc_gen.c
> -MOSTLYCLEANFILES = fourcc_gen
> +MOSTLYCLEANFILES = fourcc_gen$(BUILDEXEEXT)
> 
> -fourcc_gen: misc/fourcc_gen.c misc/fourcc_list.h ../include/vlc_fourcc.h
> +fourcc_gen$(BUILDEXEEXT): misc/fourcc_gen.c misc/fourcc_list.h
> ../include/vlc_fourcc.h $(AM_V_at)rm -f -- $@
>  	$(AM_V_CC)$(BUILDCC) -I$(srcdir) -o $@ $<
> 
> -fourcc_tables.h: fourcc_gen
> +fourcc_tables.h: fourcc_gen$(BUILDEXEEXT)
>  	$(AM_V_at)rm -f -- $@.tmp
>  	$(AM_V_GEN)$(builddir)/fourcc_gen > $@.tmp
>  	$(AM_V_at)mv -f -- $@.tmp $@

-- 
Rémi Denis-Courmont
http://www.remlab.net/