[vlc-devel] [PATCH] contrib: qt: Fix AddStaticLink.sh script for macOS

[Alexandre Janniaux]

Hi,

This doesn't break linux -> windows cross compilation build so LGTM, although it
wouldn't be negative to explain what it fixes exactly in the commit message.

Regards,
--
Alexandre Janniaux
VideoLabs

On Fri, Jul 26, 2019 at 09:08:47PM +0200, Marvin Scholz wrote:
> ---
>  contrib/src/qt/AddStaticLink.sh | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/contrib/src/qt/AddStaticLink.sh b/contrib/src/qt/AddStaticLink.sh
> index 8ad823577c..2ba65707cd 100755
> --- a/contrib/src/qt/AddStaticLink.sh
> +++ b/contrib/src/qt/AddStaticLink.sh
> @@ -6,7 +6,7 @@
>  #
>  # This could also be done in configure.ac to detect what plugins are available and where to add them
>
> -PREFIX=$(realpath "$1")
> +PREFIX=$(python -c "import os; print(os.path.realpath('$1'))")
>  PLUGIN_PATH="$3"
>  PLUGIN_NAME="$4"
>
> @@ -31,10 +31,10 @@ fi
>  LIBS=$(sed -e "/QMAKE_PRL_LIBS/ { \
>               s/QMAKE_PRL_LIBS =//; \
>               s@$PREFIX/lib@\${libdir}@g; \
> -             s@\$\$\[QT_INSTALL_LIBS\]@\${libdir}@g; p \
> -         }; d"  $PRL_SOURCE )
> +             s@\$\$\[QT_INSTALL_LIBS\]@\${libdir}@g;" -e "p" \
> +         -e "};" -e "d"  $PRL_SOURCE )
>
>  # prepend the plugin that uses the module
> -sed -i -e "s# -l${2}# -l${PLUGIN_NAME} -l${2}#" $PC_DEST
> +sed -i.bak -e "s# -l${2}# -l${PLUGIN_NAME} -l${2}#" $PC_DEST
>  # add the plugin static dependencies to the ones of the module
> -sed -i -e "s#Libs.private: #Libs.private: $LIBS -L\${prefix}/${PLUGIN_PATH} #" $PC_DEST
> +sed -i.bak -e "s#Libs.private: #Libs.private: $LIBS -L\${prefix}/${PLUGIN_PATH} #" $PC_DEST
> --
> 2.19.1
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel