simon987/sist2-build-arm64
1
0
Fork 0
mirror of https://github.com/simon987/sist2-build-arm64.git synced 2025-04-21 03:26:42 +00:00
Code Issues Projects Releases Wiki Activity

arm64 fix

Browse Source
This commit is contained in:
simon987 2021-11-13 21:23:21 -05:00
parent d5d4fae472
commit ce3dce5b07
3 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:20.04 FROM --platform="linux/arm64/v8" ubuntu:20.04
MAINTAINER simon987 <me@simon987.net> MAINTAINER simon987 <me@simon987.net>
@ -8,12 +8,11 @@ RUN DEBIAN_FRONTEND="noninteractive" apt install -y pkg-config python3 python3-p
yasm ragel automake autotools-dev wget libtool libssl-dev \ yasm ragel automake autotools-dev wget libtool libssl-dev \
curl zip unzip tar xorg-dev libglu1-mesa-dev libxcursor-dev \ curl zip unzip tar xorg-dev libglu1-mesa-dev libxcursor-dev \
libxml2-dev libxinerama-dev libcurl4-openssl-dev gettext \ libxml2-dev libxinerama-dev libcurl4-openssl-dev gettext \
gcc g++ git make \ gcc g++ git make bison \
&& apt clean && apt clean
# cmake # cmake
RUN wget https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2.tar.gz && \ RUN curl -L https://github.com/Kitware/CMake/releases/download/v3.21.4/cmake-3.21.4-linux-aarch64.tar.gz | tar -xzf - --strip-components=1 -C /usr/
tar -xzf cmake-*.tar.gz && cd cmake-* && ./bootstrap && make -j4 && make install && rm -rf /cmake-*
# Ninja # Ninja
RUN git clone git://github.com/ninja-build/ninja.git && \ RUN git clone git://github.com/ninja-build/ninja.git && \
@ -31,7 +30,7 @@ RUN cd vcpkg && ./bootstrap-vcpkg.sh
ADD patches/* / ADD patches/* /
RUN patch -p0 < mupdf-curl-dep.patch RUN patch -p0 < mupdf-curl-dep.patch
RUN patch -p0 < mongoose-master.patch RUN patch -p0 < mongoose-master.patch
RUN patch -p0 < glib-meson-fix.patch RUN cd /vcpkg/ && patch -p1 < ../glib-meson-fix.patch
RUN VCPKG_FORCE_SYSTEM_BINARIES=true ./vcpkg/vcpkg install \ RUN VCPKG_FORCE_SYSTEM_BINARIES=true ./vcpkg/vcpkg install \
curl[core,openssl] \ curl[core,openssl] \
@ -40,3 +39,8 @@ RUN VCPKG_FORCE_SYSTEM_BINARIES=true ./vcpkg/vcpkg install \
RUN mkdir /vcpkg/downloads; VCPKG_FORCE_SYSTEM_BINARIES=true ./vcpkg/vcpkg install \ RUN mkdir /vcpkg/downloads; VCPKG_FORCE_SYSTEM_BINARIES=true ./vcpkg/vcpkg install \
lmdb cjson glib brotli libarchive[core,bzip2,libxml2,lz4,lzma,lzo] pthread tesseract libxml2 libmupdf gtest mongoose libuuid libmagic libraw jasper lcms gumbo \ lmdb cjson glib brotli libarchive[core,bzip2,libxml2,lz4,lzma,lzo] pthread tesseract libxml2 libmupdf gtest mongoose libuuid libmagic libraw jasper lcms gumbo \
&& rm -rf /root/.cache/vcpkg /vcpkg/downloads /vcpkg/buildtrees /vcpkg/downloads && rm -rf /root/.cache/vcpkg /vcpkg/downloads /vcpkg/buildtrees /vcpkg/downloads
RUN mkdir -p /debug/lib/ && mkdir -p /include && \
cp -r /vcpkg/installed/arm64-linux/include/cjson/ /include/ && \
cp /vcpkg/installed/arm64-linux/debug/lib/libcjson.a /debug/lib/ && \
cp /vcpkg/installed/arm64-linux/lib/libcjson.a /lib/

16
patches/glib-meson-fix.patch
View File

@ -1,11 +1,13 @@
--- /vcpkg/scripts/cmake/vcpkg_configure_meson.cmake diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake
+++ /vcpkg/scripts/cmake/vcpkg_configure_meson.cmake index e0eab20..4c5d7be 100644
@@ -220,7 +220,7 @@ function(vcpkg_internal_meson_generate_cross_file _additional_binaries) #https:/ --- a/scripts/cmake/vcpkg_configure_meson.cmake
OUTPUT_VARIABLE MACHINE +++ b/scripts/cmake/vcpkg_configure_meson.cmake
COMMAND_ERROR_IS_FATAL ANY) @@ -241,7 +241,7 @@ function(z_vcpkg_meson_generate_cross_file additional_binaries) #https://mesonbu
# Show real machine architecture to visually understand whether we are in a native Apple Silicon terminal or running under Rosetta emulation
debug_message("Machine: ${MACHINE}")
- if(MACHINE MATCHES "arm64") - if(MACHINE MATCHES "arm64")
+ if(MACHINE MATCHES "arm64|aarch64") + if(MACHINE MATCHES "arm64|aarch64")
set(BUILD_CPU_FAM aarch64) set(build_cpu_fam aarch64)
set(BUILD_CPU armv8) set(build_cpu armv8)
elseif(MACHINE MATCHES "x86_64|amd64") elseif(MACHINE MATCHES "x86_64|amd64")

28
patches/mupdf-curl-dep.patch
View File

@ -1,10 +1,18 @@
--- /vcpkg/ports/libmupdf/CONTROL 2021-04-13 00:31:01.000000000 +0000 --- /vcpkg/ports/libmupdf/vcpkg.json 2021-09-22 09:11:22.598136284 -0400
+++ /vcpkg/ports/libmupdf/CONTROL_ 2021-04-13 00:42:40.805239545 +0000 +++ /vcpkg/ports/libmupdf/vcpkg.json_ 2021-11-07 10:14:38.039574071 -0500
@@ -1,6 +1,6 @@ @@ -5,7 +5,13 @@
Source: libmupdf "homepage": "https://github.com/ArtifexSoftware/mupdf",
Version: 1.18.0 "supports": "!osx",
-Build-Depends: freetype, libjpeg-turbo, harfbuzz, zlib, curl, glfw3, openjpeg, jbig2dec, gumbo "dependencies": [
+Build-Depends: freetype, libjpeg-turbo, harfbuzz, zlib, curl[core,openssl], glfw3, openjpeg, jbig2dec, gumbo - "curl",
Homepage: https://github.com/ArtifexSoftware/mupdf + {
Description: a lightweight PDF, XPS, and E-book library + "name": "curl",
Supports: !osx + "default-features": false,
+ "features": [
+ "openssl"
+ ]
+ },
"freetype",
"glfw3",
"gumbo",