Skip to content

Commit

Permalink
.packaging: Update llvm-mingw to 20240518
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndreRH
AndreRH committed May 30, 2024
1 parent 452711a commit a0c2168
Show file tree
Hide file tree
Showing 16 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .packaging/debian11/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libgnutls28-dev:arm64 \
libcups2-dev:arm64

RUN cd /opt; wget https://github.com/mstorsjo/llvm-mingw/releases/download/20240320/llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz
RUN cd /opt; wget https://github.com/mstorsjo/llvm-mingw/releases/download/20240518/llvm-mingw-20240518-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20240518-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz
2 changes: 1 addition & 1 deletion .packaging/debian11/wine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ RUN rm -rf /opt/wine; mkdir -p /opt/wine/
COPY ./ /opt/wine/
RUN ls -la /opt/wine/
RUN cp -ra /opt/wine /opt/wine64
ENV PATH="/opt/llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
ENV PATH="/opt/llvm-mingw-20240518-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
RUN cd /opt/wine64; mkdir amd64; cd amd64; ../configure --enable-win64; make __tooldeps__ -j `nproc`; make -C nls
RUN cd /opt/wine; dpkg-buildpackage -d -b -a arm64 -us -uc -ui
2 changes: 1 addition & 1 deletion .packaging/debian11/wine/debian/rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

export DEB_CFLAGS_MAINT_STRIP = -fstack-protector-strong -fcf-protection=full
export DEB_BUILD_MAINT_OPTIONS = optimize=-lto hardening=-relro
export PATH = /opt/llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
export PATH = /opt/llvm-mingw-20240518-ucrt-ubuntu-20.04-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

%:
dh $@ --parallel
Expand Down
2 changes: 1 addition & 1 deletion .packaging/debian12/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libgnutls28-dev:arm64 \
libcups2-dev:arm64

RUN cd /opt; wget https://github.com/mstorsjo/llvm-mingw/releases/download/20240320/llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz
RUN cd /opt; wget https://github.com/mstorsjo/llvm-mingw/releases/download/20240518/llvm-mingw-20240518-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20240518-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz
2 changes: 1 addition & 1 deletion .packaging/debian12/fexpe/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM foundationdebian12
RUN rm -rf /opt/fex; mkdir -p /opt/fex/
COPY ./ /opt/fex/
RUN ls -la /opt/fex/
ENV PATH="/opt/llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
ENV PATH="/opt/llvm-mingw-20240518-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
RUN cd /opt/fex; mkdir build; cd build; cmake -DCMAKE_TOOLCHAIN_FILE=../toolchain_mingw.cmake -DENABLE_JEMALLOC=0 -DENABLE_JEMALLOC_GLIBC_ALLOC=0 -DMINGW_TRIPLE=aarch64-w64-mingw32 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTS=False -DENABLE_ASSERTIONS=False ..; make -j `nproc` wow64fex
RUN ls -la /opt/fex/build/Bin
RUN aarch64-w64-mingw32-strip --strip-unneeded /opt/fex/build/Bin/libwow64fex.dll
Expand Down
2 changes: 1 addition & 1 deletion .packaging/debian12/wine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ RUN rm -rf /opt/wine; mkdir -p /opt/wine/
COPY ./ /opt/wine/
RUN ls -la /opt/wine/
RUN cp -ra /opt/wine /opt/wine64
ENV PATH="/opt/llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
ENV PATH="/opt/llvm-mingw-20240518-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
RUN cd /opt/wine64; mkdir amd64; cd amd64; ../configure --enable-win64; make __tooldeps__ -j `nproc`; make -C nls
RUN cd /opt/wine; dpkg-buildpackage -d -b -a arm64 -us -uc -ui
2 changes: 1 addition & 1 deletion .packaging/debian12/wine/debian/rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

export DEB_CFLAGS_MAINT_STRIP = -fstack-protector-strong -fcf-protection=full
export DEB_BUILD_MAINT_OPTIONS = optimize=-lto hardening=-relro
export PATH = /opt/llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
export PATH = /opt/llvm-mingw-20240518-ucrt-ubuntu-20.04-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

%:
dh $@ --parallel
Expand Down
2 changes: 1 addition & 1 deletion .packaging/ubuntu2204/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libgnutls28-dev:arm64 \
libcups2-dev:arm64

RUN cd /opt; wget https://github.com/mstorsjo/llvm-mingw/releases/download/20240320/llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz
RUN cd /opt; wget https://github.com/mstorsjo/llvm-mingw/releases/download/20240518/llvm-mingw-20240518-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20240518-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz
2 changes: 1 addition & 1 deletion .packaging/ubuntu2204/wine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ RUN rm -rf /opt/wine; mkdir -p /opt/wine/
COPY ./ /opt/wine/
RUN ls -la /opt/wine/
RUN cp -ra /opt/wine /opt/wine64
ENV PATH="/opt/llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
ENV PATH="/opt/llvm-mingw-20240518-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
RUN cd /opt/wine64; mkdir amd64; cd amd64; ../configure --enable-win64; make __tooldeps__ -j `nproc`; make -C nls
RUN cd /opt/wine; dpkg-buildpackage -d -b -a arm64 -us -uc -ui
2 changes: 1 addition & 1 deletion .packaging/ubuntu2204/wine/debian/rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

export DEB_CFLAGS_MAINT_STRIP = -fstack-protector-strong -fcf-protection=full
export DEB_BUILD_MAINT_OPTIONS = optimize=-lto hardening=-relro
export PATH = /opt/llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
export PATH = /opt/llvm-mingw-20240518-ucrt-ubuntu-20.04-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

%:
dh $@ --parallel
Expand Down
2 changes: 1 addition & 1 deletion .packaging/ubuntu2310/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libgnutls28-dev:arm64 \
libcups2-dev:arm64

RUN cd /opt; wget https://github.com/mstorsjo/llvm-mingw/releases/download/20240320/llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz
RUN cd /opt; wget https://github.com/mstorsjo/llvm-mingw/releases/download/20240518/llvm-mingw-20240518-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20240518-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz
2 changes: 1 addition & 1 deletion .packaging/ubuntu2310/wine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ RUN rm -rf /opt/wine; mkdir -p /opt/wine/
COPY ./ /opt/wine/
RUN ls -la /opt/wine/
RUN cp -ra /opt/wine /opt/wine64
ENV PATH="/opt/llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
ENV PATH="/opt/llvm-mingw-20240518-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
RUN cd /opt/wine64; mkdir amd64; cd amd64; ../configure --enable-win64; make __tooldeps__ -j `nproc`; make -C nls
RUN cd /opt/wine; dpkg-buildpackage -d -b -a arm64 -us -uc -ui
2 changes: 1 addition & 1 deletion .packaging/ubuntu2310/wine/debian/rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

export DEB_CFLAGS_MAINT_STRIP = -fstack-protector-strong -fcf-protection=full
export DEB_BUILD_MAINT_OPTIONS = optimize=-lto hardening=-relro
export PATH = /opt/llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
export PATH = /opt/llvm-mingw-20240518-ucrt-ubuntu-20.04-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

%:
dh $@ --parallel
Expand Down
2 changes: 1 addition & 1 deletion .packaging/ubuntu2404/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libgnutls28-dev:arm64 \
libcups2-dev:arm64

RUN cd /opt; wget https://github.com/mstorsjo/llvm-mingw/releases/download/20240320/llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz
RUN cd /opt; wget https://github.com/mstorsjo/llvm-mingw/releases/download/20240518/llvm-mingw-20240518-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20240518-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz
2 changes: 1 addition & 1 deletion .packaging/ubuntu2404/wine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ RUN rm -rf /opt/wine; mkdir -p /opt/wine/
COPY ./ /opt/wine/
RUN ls -la /opt/wine/
RUN cp -ra /opt/wine /opt/wine64
ENV PATH="/opt/llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
ENV PATH="/opt/llvm-mingw-20240518-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
RUN cd /opt/wine64; mkdir amd64; cd amd64; ../configure --enable-win64; make __tooldeps__ -j `nproc`; make -C nls
RUN cd /opt/wine; dpkg-buildpackage -d -b -a arm64 -us -uc -ui
2 changes: 1 addition & 1 deletion .packaging/ubuntu2404/wine/debian/rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

export DEB_CFLAGS_MAINT_STRIP = -fstack-protector-strong -fcf-protection=full
export DEB_BUILD_MAINT_OPTIONS = optimize=-lto hardening=-relro
export PATH = /opt/llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
export PATH = /opt/llvm-mingw-20240518-ucrt-ubuntu-20.04-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

%:
dh $@ --parallel
Expand Down

0 comments on commit a0c2168

Please sign in to comment.