simon987/sist2-build-arm64
1
0
Fork 0
mirror of https://github.com/simon987/sist2-build-arm64.git synced 2025-12-20 10:35:58 +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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,13 @@
--- /vcpkg/scripts/cmake/vcpkg_configure_meson.cmake
+++ /vcpkg/scripts/cmake/vcpkg_configure_meson.cmake
@@ -220,7 +220,7 @@ function(vcpkg_internal_meson_generate_cross_file _additional_binaries) #https:/
OUTPUT_VARIABLE MACHINE
COMMAND_ERROR_IS_FATAL ANY)
diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake
index e0eab20..4c5d7be 100644
--- a/scripts/cmake/vcpkg_configure_meson.cmake
+++ b/scripts/cmake/vcpkg_configure_meson.cmake
@@ -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|aarch64")
set(BUILD_CPU_FAM aarch64)
set(BUILD_CPU armv8)
set(build_cpu_fam aarch64)
set(build_cpu armv8)
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/CONTROL_ 2021-04-13 00:42:40.805239545 +0000
@@ -1,6 +1,6 @@
Source: libmupdf
Version: 1.18.0
-Build-Depends: freetype, libjpeg-turbo, harfbuzz, zlib, curl, glfw3, openjpeg, jbig2dec, gumbo
+Build-Depends: freetype, libjpeg-turbo, harfbuzz, zlib, curl[core,openssl], glfw3, openjpeg, jbig2dec, gumbo
Homepage: https://github.com/ArtifexSoftware/mupdf
Description: a lightweight PDF, XPS, and E-book library
Supports: !osx
--- /vcpkg/ports/libmupdf/vcpkg.json 2021-09-22 09:11:22.598136284 -0400
+++ /vcpkg/ports/libmupdf/vcpkg.json_ 2021-11-07 10:14:38.039574071 -0500
@@ -5,7 +5,13 @@
"homepage": "https://github.com/ArtifexSoftware/mupdf",
"supports": "!osx",
"dependencies": [
- "curl",
+ {
+ "name": "curl",
+ "default-features": false,
+ "features": [
+ "openssl"
+ ]
+ },
"freetype",
"glfw3",
"gumbo",