Skip to content

Commit

Permalink
new llvm-mingw
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndreRH
AndreRH committed Dec 24, 2024
1 parent d45e70f commit ab1937f
Show file tree
Hide file tree
Showing 21 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .packaging/debian11/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libxkbregistry-dev:arm64 \
libwayland-dev:arm64

RUN cd /opt; wget https://github.com/bylaws/llvm-mingw/releases/download/20240929/llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz; mv llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64 bylaws-llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64
RUN cd /opt; wget https://github.com/bylaws/llvm-mingw/releases/download/20241812/llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz; mv llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64 bylaws-llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64
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/bylaws-llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
ENV PATH="/opt/bylaws-llvm-mingw-20241218-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/bylaws-llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
export PATH = /opt/bylaws-llvm-mingw-20241218-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 @@ -64,4 +64,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libxkbregistry-dev:arm64 \
libwayland-dev:arm64

RUN cd /opt; wget https://github.com/bylaws/llvm-mingw/releases/download/20240929/llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz; mv llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64 bylaws-llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64
RUN cd /opt; wget https://github.com/bylaws/llvm-mingw/releases/download/20241812/llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz; mv llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64 bylaws-llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64
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/bylaws-llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
ENV PATH="/opt/bylaws-llvm-mingw-20241218-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/bylaws-llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
export PATH = /opt/bylaws-llvm-mingw-20241218-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/ubuntu2004/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libxkbcommon-dev:arm64 \
libwayland-dev:arm64

RUN cd /opt; wget https://github.com/bylaws/llvm-mingw/releases/download/20240929/llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz; mv llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64 bylaws-llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64
RUN cd /opt; wget https://github.com/bylaws/llvm-mingw/releases/download/20241812/llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz; mv llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64 bylaws-llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64
2 changes: 1 addition & 1 deletion .packaging/ubuntu2004/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/bylaws-llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
ENV PATH="/opt/bylaws-llvm-mingw-20241218-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/ubuntu2004/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/bylaws-llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
export PATH = /opt/bylaws-llvm-mingw-20241218-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 @@ -65,4 +65,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libwayland-dev:arm64 \
meson glslang-dev glslang-tools

RUN cd /opt; wget https://github.com/bylaws/llvm-mingw/releases/download/20240929/llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz; mv llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64 bylaws-llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64
RUN cd /opt; wget https://github.com/bylaws/llvm-mingw/releases/download/20241812/llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz; mv llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64 bylaws-llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64
2 changes: 1 addition & 1 deletion .packaging/ubuntu2204/dxvk/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ FROM foundationubuntu2204
RUN rm -rf /opt/dxvk; mkdir -p /opt/dxvk/output
COPY ./ /opt/dxvk/
RUN ls -la /opt/dxvk/
ENV PATH="/opt/bylaws-llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
ENV PATH="/opt/bylaws-llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
RUN cd /opt/dxvk; ./package-release.sh $(git describe --abbrev=0) /opt/dxvk/output
2 changes: 1 addition & 1 deletion .packaging/ubuntu2204/fexpe/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM foundationubuntu2204
RUN rm -rf /opt/fex; mkdir -p /opt/fex/
COPY ./ /opt/fex/
RUN ls -la /opt/fex/
ENV PATH="/opt/bylaws-llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
ENV PATH="/opt/bylaws-llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
RUN cd /opt/fex; mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE=../toolchain_mingw.cmake -DENABLE_LTO=False -DMINGW_TRIPLE=aarch64-w64-mingw32 -DBUILD_TESTS=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/ubuntu2204/fexpeec/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM foundationubuntu2204
RUN rm -rf /opt/fex; mkdir -p /opt/fex/
COPY ./ /opt/fex/
RUN ls -la /opt/fex/
ENV PATH="/opt/bylaws-llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
ENV PATH="/opt/bylaws-llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
RUN cd /opt/fex; mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE=../toolchain_mingw.cmake -DENABLE_LTO=False -DMINGW_TRIPLE=arm64ec-w64-mingw32 -DBUILD_TESTS=False ..; make -j `nproc` arm64ecfex
RUN ls -la /opt/fex/build/Bin
RUN arm64ec-w64-mingw32-strip --strip-unneeded /opt/fex/build/Bin/libarm64ecfex.dll
Expand Down
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/bylaws-llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
ENV PATH="/opt/bylaws-llvm-mingw-20241218-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/bylaws-llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
export PATH = /opt/bylaws-llvm-mingw-20241218-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 @@ -62,4 +62,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libxkbregistry-dev:arm64 \
libwayland-dev:arm64

RUN cd /opt; wget https://github.com/bylaws/llvm-mingw/releases/download/20240929/llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz; mv llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64 bylaws-llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64
RUN cd /opt; wget https://github.com/bylaws/llvm-mingw/releases/download/20241812/llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz; mv llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64 bylaws-llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64
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/bylaws-llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
ENV PATH="/opt/bylaws-llvm-mingw-20241218-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/bylaws-llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
export PATH = /opt/bylaws-llvm-mingw-20241218-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/ubuntu2410/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libxkbregistry-dev:arm64 \
libwayland-dev:arm64

RUN cd /opt; wget https://github.com/bylaws/llvm-mingw/releases/download/20240929/llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz; mv llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64 bylaws-llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64
RUN cd /opt; wget https://github.com/bylaws/llvm-mingw/releases/download/20241812/llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64.tar.xz; tar -xJf llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64.tar.xz; rm *.tar.xz; mv llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64 bylaws-llvm-mingw-20241218-ucrt-ubuntu-20.04-x86_64

# This ntsync.h is incomplete and would break the build
RUN rm /usr/aarch64-linux-gnu/include/linux/ntsync.h /usr/include/linux/ntsync.h
2 changes: 1 addition & 1 deletion .packaging/ubuntu2410/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/bylaws-llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64/bin:$PATH"
ENV PATH="/opt/bylaws-llvm-mingw-20241218-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/ubuntu2410/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/bylaws-llvm-mingw-20240929-ucrt-ubuntu-20.04-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
export PATH = /opt/bylaws-llvm-mingw-20241218-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 ab1937f

Please sign in to comment.