fix windows dockerfiles again

This commit is contained in:
therecipe 2018-08-22 16:35:04 +02:00
parent d0f30a6e4c
commit 3f1f1f4d27
16 changed files with 17 additions and 17 deletions

View file

@ -439,8 +439,8 @@ func createCgo(module, path, target string, mode int, ipkg, tags string) string
fmt.Fprintf(bb, "#cgo LDFLAGS: -Wl,-syslibroot,%v/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/%v -mios-simulator-version-min=10.0\n", utils.XCODE_DIR(), utils.IPHONESIMULATOR_SDK_DIR())
}
fmt.Fprintf(bb, "#cgo CFLAGS: -Wno-unused-parameter -Wno-unused-variable -Wno-return-type\n")
fmt.Fprintf(bb, "#cgo CXXFLAGS: -Wno-unused-parameter -Wno-unused-variable -Wno-return-type\n")
fmt.Fprint(bb, "#cgo CFLAGS: -Wno-unused-parameter -Wno-unused-variable -Wno-return-type\n")
fmt.Fprint(bb, "#cgo CXXFLAGS: -Wno-unused-parameter -Wno-unused-variable -Wno-return-type\n")
fmt.Fprint(bb, "*/\nimport \"C\"\n")

View file

@ -1,4 +1,4 @@
FROM therecipe/qt:windows_32_shared_base_6 as base
RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.shared' qt5
RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.shared' EXCLUDE_PKGS='qtwebkit' qt5
RUN rm -rf /usr/lib/mxe/log && rm -rf /usr/lib/mxe/pkg

View file

@ -4,4 +4,4 @@ LABEL maintainer therecipe
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git
RUN git clone https://github.com/mxe/mxe.git /usr/lib/mxe
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install autoconf automake autopoint bash bison bzip2 flex g++ g++-multilib gettext git gperf intltool libc6-dev-i386 libgdk-pixbuf2.0-dev libltdl-dev libssl-dev libtool-bin libxml-parser-perl make openssl p7zip-full patch perl pkg-config python ruby scons sed unzip wget xz-utils
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.shared' gcc gettext openssl glib lzo
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' gcc gettext openssl glib lzo

View file

@ -1,4 +1,4 @@
FROM therecipe/qt:windows_64_shared_base_1
LABEL maintainer therecipe
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.shared' icu4c bzip2 libpng freetype-bootstrap fontconfig freetds pixman cairo harfbuzz freetype jpeg cmake cmake-conf libmysqlclient pcre2 pthreads postgresql sqlite
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' icu4c bzip2 libpng freetype-bootstrap fontconfig freetds pixman cairo harfbuzz freetype jpeg cmake cmake-conf libmysqlclient pcre2 pthreads postgresql sqlite

View file

@ -1,4 +1,4 @@
FROM therecipe/qt:windows_64_shared_base_2
LABEL maintainer therecipe
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.shared' qtbase
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' qtbase

View file

@ -1,4 +1,4 @@
FROM therecipe/qt:windows_64_shared_base_3
LABEL maintainer therecipe
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.shared' qtdeclarative
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' qtdeclarative

View file

@ -1,4 +1,4 @@
FROM therecipe/qt:windows_64_shared_base_4
LABEL maintainer therecipe
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.shared' qt3d
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' qt3d

View file

@ -1,4 +1,4 @@
FROM therecipe/qt:windows_64_shared_base_5
LABEL maintainer therecipe
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.shared' qtactiveqt qtcanvas3d qtmultimedia qtcharts qtconnectivity qtdatavis3d qtgraphicaleffects jasper xz tiff lcms libmng libwebp qtimageformats qtlocation
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' qtactiveqt qtcanvas3d qtmultimedia qtcharts qtconnectivity qtdatavis3d qtgraphicaleffects jasper xz tiff lcms libmng libwebp qtimageformats qtlocation

View file

@ -1,4 +1,4 @@
FROM therecipe/qt:windows_64_shared_base_6 as base
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.shared' qt5
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' EXCLUDE_PKGS='qtwebkit' qt5
RUN rm -rf /usr/lib/mxe/log && rm -rf /usr/lib/mxe/pkg

View file

@ -4,4 +4,4 @@ LABEL maintainer therecipe
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git
RUN git clone https://github.com/mxe/mxe.git /usr/lib/mxe
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install autoconf automake autopoint bash bison bzip2 flex g++ g++-multilib gettext git gperf intltool libc6-dev-i386 libgdk-pixbuf2.0-dev libltdl-dev libssl-dev libtool-bin libxml-parser-perl make openssl p7zip-full patch perl pkg-config python ruby scons sed unzip wget xz-utils
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.static' gcc gettext openssl glib lzo
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' gcc gettext openssl glib lzo

View file

@ -1,4 +1,4 @@
FROM therecipe/qt:windows_64_static_base_1
LABEL maintainer therecipe
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.static' icu4c bzip2 libpng freetype-bootstrap fontconfig freetds pixman cairo harfbuzz freetype jpeg cmake cmake-conf libmysqlclient pcre2 pthreads postgresql sqlite
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' icu4c bzip2 libpng freetype-bootstrap fontconfig freetds pixman cairo harfbuzz freetype jpeg cmake cmake-conf libmysqlclient pcre2 pthreads postgresql sqlite

View file

@ -1,4 +1,4 @@
FROM therecipe/qt:windows_64_static_base_2
LABEL maintainer therecipe
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.static' qtbase
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' qtbase

View file

@ -1,4 +1,4 @@
FROM therecipe/qt:windows_64_static_base_3
LABEL maintainer therecipe
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.static' qtdeclarative
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' qtdeclarative

View file

@ -1,4 +1,4 @@
FROM therecipe/qt:windows_64_static_base_4
LABEL maintainer therecipe
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.static' qt3d
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' qt3d

View file

@ -1,4 +1,4 @@
FROM therecipe/qt:windows_64_static_base_5
LABEL maintainer therecipe
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.static' qtactiveqt qtcanvas3d qtmultimedia qtcharts qtconnectivity qtdatavis3d qtgraphicaleffects jasper xz tiff lcms libmng libwebp qtimageformats qtlocation
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' qtactiveqt qtcanvas3d qtmultimedia qtcharts qtconnectivity qtdatavis3d qtgraphicaleffects jasper xz tiff lcms libmng libwebp qtimageformats qtlocation

View file

@ -1,4 +1,4 @@
FROM therecipe/qt:windows_64_static_base_6 as base
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.static' qt5
RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' qt5
RUN rm -rf /usr/lib/mxe/log && rm -rf /usr/lib/mxe/pkg