From 63e9a7cafa65bb0919272757167d53c0b5a216f1 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 16 Mar 2023 11:55:37 +0100 Subject: [PATCH] commented out SDK statments, testing if mach bootstrap grabs the SDK --- assets/macos.Dockerfile | 19 +++++++++++++------ assets/macos.mozconfig | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/assets/macos.Dockerfile b/assets/macos.Dockerfile index 4e8e87a..43c04aa 100644 --- a/assets/macos.Dockerfile +++ b/assets/macos.Dockerfile @@ -16,21 +16,28 @@ ENV wasi_mainversion 14 # dependencies needed to run ./mach bootstrap 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 +#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 + + # run the bootstrap RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$version-$source_release/librewolf-$version-$source_release.source.tar.gz RUN tar xf librewolf-$version-$source_release.source.tar.gz 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 + RUN ./mach artifact toolchain --from-build linux64-libdmg RUN ./mach artifact toolchain --from-build linux64-cctools-port RUN ./mach artifact toolchain --from-build linux64-hfsplus diff --git a/assets/macos.mozconfig b/assets/macos.mozconfig index a70a064..0023efe 100644 --- a/assets/macos.mozconfig +++ b/assets/macos.mozconfig @@ -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