Skip to content

Commit

Permalink
sync with x64 image
Browse files Browse the repository at this point in the history
  • Loading branch information
mmicko committed May 23, 2021
1 parent 49cfa6e commit 3a4531c
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
24 changes: 24 additions & 0 deletions docker/cross-darwin-arm64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,8 @@ RUN cd /opt \
&& cp /opt/local/share/pkgconfig/* /opt/local/lib/pkgconfig/. \
&& cp -r /opt/local/share/cmake /tmp \
&& cp -r /opt/local/share/eigen3 /tmp \
&& cp -r /opt/local/share/gir-1.0 /tmp \
&& cp -r /opt/local/share/glib-2.0 /tmp \
&& rm -rf /opt/local/etc \
&& rm -rf /opt/local/libexec \
&& rm -rf /opt/local/sbin \
Expand All @@ -225,6 +227,8 @@ RUN cd /opt \
&& rm -rf /tmp/*.tbz2 \
&& mv /tmp/cmake /opt/local/share \
&& mv /tmp/eigen3 /opt/local/share \
&& mv /tmp/gir-1.0 /opt/local/share \
&& mv /tmp/glib-2.0 /opt/local/share \
&& rm -rf /tmp/* \
&& mkdir -p /usr/local/osxcross/target/macports/pkgs/opt \
&& ln -s /opt/local /usr/local/osxcross/target/macports/pkgs/opt \
Expand All @@ -244,3 +248,23 @@ RUN cp /usr/local/osxcross/target/bin/${CROSS_NAME}-otool /usr/local/osxcross/ta
COPY uname /usr/local/osxcross/target/bin/
RUN chmod +x /usr/local/osxcross/target/bin/uname

# Install just g-ir-compiler, not using apt since it adds lots more
RUN wget http://archive.ubuntu.com/ubuntu/pool/main/g/gobject-introspection/libgirepository-1.0-1_1.64.1-1~ubuntu20.04.1_amd64.deb && \
dpkg-deb -xv libgirepository-1.0-1_1.64.1-1~ubuntu20.04.1_amd64.deb / && \
rm -rf libgirepository-1.0-1_1.64.1-1~ubuntu20.04.1_amd64.deb && \
wget http://archive.ubuntu.com/ubuntu/pool/main/g/gobject-introspection/gobject-introspection_1.64.1-1~ubuntu20.04.1_amd64.deb && \
dpkg-deb -xv gobject-introspection_1.64.1-1~ubuntu20.04.1_amd64.deb / && \
rm -rf gobject-introspection_1.64.1-1~ubuntu20.04.1_amd64.deb

RUN cd /opt/local/share/gir-1.0 &&\
for i in *.gir; do \
sed -i 's|/opt/local/lib/||g' $i ; \
sed -i 's|./gdk-pixbuf/||g' $i ; \
done && \
for i in *.gir; do \
echo $i ; \
filename="${i%.*}" ; \
g-ir-compiler $i -o /opt/local/lib/girepository-1.0/$filename.typelib --includedir /opt/local/share/gir-1.0 ; \
done

COPY gschemas.compiled /opt/local/share/glib-2.0/schemas/
Binary file added docker/cross-darwin-arm64/gschemas.compiled
Binary file not shown.

0 comments on commit 3a4531c

Please sign in to comment.