librewolf-bot/bsys5
1
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity

Now using private version of SDK 13.0

Browse source
This commit is contained in:
Bert van der Weerd 2023-03-16 23:03:33 +01:00
parent 694cbfbc08
commit f2d98eba7e
No known key found for this signature in database
GPG key ID: 73370A0B9E5516B0
2 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
assets/macos.Dockerfile
View file

@ -17,14 +17,9 @@ ENV wasi_mainversion 14
RUN apt-get -y update && apt-get -y upgrade && apt-get -y install mercurial python3 python3-dev python3-pip wget build-essential libpython3-dev m4 unzip uuid zip libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdbus-glib-1-dev libdrm-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb rsync
# setup osx sdk
#RUN mkdir -p /osx-cross/MacOSX-SDKs &&\
# cd /osx-cross/MacOSX-SDKs &&\
# wget -q "https://github.com/phracker/MacOSX-SDKs/releases/download/13.0/MacOSX13.0.sdk.tar.xz" &&\
# tar xf MacOSX13.0.sdk.tar.xz &&\
# rm -f MacOSX13.0.sdk.tar.xz
#
# Setup MacOSX SDK v13.0
RUN mkdir -p /osx-cross/MacOSX-SDKs && cd /osx-cross/MacOSX-SDKs && wget https://files.stanzabird.nl/MacOSX13.0.sdk.zip && unzip MacOSX13.0.sdk.zip && rm MacOSX13.0.sdk.zip
# run the bootstrap
@ -34,7 +29,7 @@ WORKDIR librewolf-$version-$source_release
RUN echo ac_add_options --target=$arch-apple-darwin > mozconfig
RUN echo ac_add_options --enable-bootstrap >> mozconfig
#RUN echo ac_add_options --with-macos-sdk=/osx-cross/MacOSX-SDKs/MacOSX13.0.sdk >> mozconfig
RUN echo ac_add_options --with-macos-sdk=/osx-cross/MacOSX-SDKs/MacOSX13.0.sdk >> mozconfig
RUN MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser
@ -43,16 +38,7 @@ RUN ./mach artifact toolchain --from-build linux64-cctools-port
RUN ./mach artifact toolchain --from-build linux64-hfsplus
RUN ./mach artifact toolchain --from-build linux64-binutils
RUN ./mach artifact toolchain --from-build sysroot-wasm32-wasi
### MacOS SDK 13.0
#RUN ./mach artifact toolchain --from-build macosx64-sdk
#RUN ./mach artifact toolchain --from-build macosx64-sdk-13.0
RUN ./mach artifact toolchain --from-build macosx64-sdk-toolchain
RUN echo "[debug] Locate SDK folder so it can moved into place:" && pwd && ls -l && echo "[debug] end"
## RUN ./mach artifact toolchain --from-build linux64-clang-macosx-cross
RUN /root/.cargo/bin/cargo install cbindgen
RUN /root/.cargo/bin/rustup target add $arch-apple-darwin
RUN cp -r binutils /root/.mozbuild

2
assets/macos.mozconfig
View file

@ -2,7 +2,7 @@ ac_add_options --enable-application=browser
# for crosscompiling...
ac_add_options --target=_ARCH_-apple-darwin
#ac_add_options --with-macos-sdk=/osx-cross/MacOSX-SDKs/MacOSX13.0.sdk
ac_add_options --with-macos-sdk=/osx-cross/MacOSX-SDKs/MacOSX13.0.sdk
CROSS_BUILD=1
export CROSS=/root/.mozbuild