Merge branch 'master' into 'master'

Remove enforce-static.sh

libtool does what we want it to do since bd63d6f28d7b6534630bf32a990352e6b9440f4d

See merge request !14

vlc-debian-win32/Dockerfile

 FROM videolan-base-sid:latest
 
-COPY enforce-static.sh /
-
 RUN apt-get update && apt-get -y install \
     gcc-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64-tools lua5.2-dev lua5.2 \
     libtool automake autoconf autopoint make gettext pkg-config qt4-dev-tools \
@@ -11,5 +9,3 @@ RUN apt-get update && apt-get -y install \
     dpkg --add-architecture i386 && \
     apt-get update && apt-get -y install wine32 && \
     apt-get clean -y && rm -rf /var/lib/apt/lists/*
-
-RUN /enforce-static.sh

vlc-debian-win32/enforce-static.sh

-#!/bin/sh
-
-# This script enforces statically linking of libgcc, libstdc++-6, and libpthread,
-# without needing to rebuild gcc and mingw-w64 from scratch.
-# -static-libgcc -static-libstdc++ flags can not be used in a libtool build system,
-# as libtool removes flags that it doesn't understand.
-
-move() {
-    [ -f $1 ] || return 1
-    mkdir -p old/
-    mv -v $* old/
-    return 0
-}
-
-for x in i686 x86_64
-do
-    library_path_list=`$x-w64-mingw32-gcc -v /dev/null 2>&1 | grep ^LIBRARY_PATH|cut -d= -f2|sort|uniq`
-    IFS=':'
-    for i in $library_path_list
-    do
-        cd $i
-        move libstdc++-6.dll libstdc++.dll.a libgcc_s.a libgcc_s_sjlj-1.dll && ln -s libgcc_eh.a libgcc_s.a
-        move libpthread.dll.a libwinpthread.dll.a
-        move libwinpthread-1.dll
-        [ -d ../bin ] && cd ../bin && move libwinpthread-1.dll
-    done
-done
-
-exit 0

vlc-debian-win64/Dockerfile

 FROM videolan-base-sid:latest
 
-COPY enforce-static.sh /
-
 RUN apt-get update && apt-get -y install \
     gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64-tools lua5.2-dev \
     lua5.2 libtool automake autoconf autopoint make gettext pkg-config \
@@ -10,5 +8,3 @@ RUN apt-get update && apt-get -y install \
     yasm g++ protobuf-compiler m4 ant build-essential libtool-bin \
     gcc-mingw-w64-i686 g++-mingw-w64-i686 && \
     apt-get clean -y && rm -rf /var/lib/apt/lists/*
-
-RUN /enforce-static.sh

vlc-debian-win64/enforce-static.sh

-#!/bin/sh
-
-# This script enforces statically linking of libgcc, libstdc++-6, and libpthread,
-# without needing to rebuild gcc and mingw-w64 from scratch.
-# -static-libgcc -static-libstdc++ flags can not be used in a libtool build system,
-# as libtool removes flags that it doesn't understand.
-
-move() {
-    [ -f $1 ] || return 1
-    mkdir -p old/
-    mv -v $* old/
-    return 0
-}
-
-for x in i686 x86_64
-do
-    library_path_list=`$x-w64-mingw32-gcc -v /dev/null 2>&1 | grep ^LIBRARY_PATH|cut -d= -f2|sort|uniq`
-    IFS=':'
-    for i in $library_path_list
-    do
-        cd $i
-        move libstdc++-6.dll libstdc++.dll.a libgcc_s.a libgcc_s_sjlj-1.dll && ln -s libgcc_eh.a libgcc_s.a
-        move libpthread.dll.a libwinpthread.dll.a
-        move libwinpthread-1.dll
-        [ -d ../bin ] && cd ../bin && move libwinpthread-1.dll
-    done
-done
-
-exit 0