diff --git a/vlc-debian-win32/Dockerfile b/vlc-debian-win32/Dockerfile index 104859cc91b4796c3c5649132eddaf1646dd34c6..90a903bc002a2f2ed0ccc5dca485dbdc9d863ba4 100644 --- a/vlc-debian-win32/Dockerfile +++ b/vlc-debian-win32/Dockerfile @@ -1,7 +1,5 @@ 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 diff --git a/vlc-debian-win32/enforce-static.sh b/vlc-debian-win32/enforce-static.sh deleted file mode 100755 index 72515450ccdfd2304903f312001ca88b364a6308..0000000000000000000000000000000000000000 --- a/vlc-debian-win32/enforce-static.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/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 diff --git a/vlc-debian-win64/Dockerfile b/vlc-debian-win64/Dockerfile index 0062cfd95ecc6a6ba230c651a347066dcb719220..1ba7dc484f23e8284034d30f8b4483841adb31a2 100644 --- a/vlc-debian-win64/Dockerfile +++ b/vlc-debian-win64/Dockerfile @@ -1,7 +1,5 @@ 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 diff --git a/vlc-debian-win64/enforce-static.sh b/vlc-debian-win64/enforce-static.sh deleted file mode 100755 index 72515450ccdfd2304903f312001ca88b364a6308..0000000000000000000000000000000000000000 --- a/vlc-debian-win64/enforce-static.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/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