imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-28 07:47:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: Revert wasm libmagic patches

Browse Source
This commit is contained in:
WerWolv
2025-06-28 13:47:42 +02:00
parent bd8b3f8a29
commit 2a8dd0873b
1 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dist/web/Dockerfile vendored
View File

@@ -1,4 +1,4 @@
FROM emscripten/emsdk:4.0.10 AS build FROM emscripten/emsdk:4.0.8 AS build
# Used to invalidate layer cache but not mount cache # Used to invalidate layer cache but not mount cache
# See https://github.com/moby/moby/issues/41715#issuecomment-733976493 # See https://github.com/moby/moby/issues/41715#issuecomment-733976493
@@ -16,20 +16,6 @@ git clone https://github.com/microsoft/vcpkg /vcpkg
git -C /vcpkg pull git -C /vcpkg pull
/vcpkg/bootstrap-vcpkg.sh /vcpkg/bootstrap-vcpkg.sh
sed -i 's/vcpkg_install_make(${EXTRA_ARGS})/vcpkg_install_make(${EXTRA_ARGS} SUBPATH src)/g' /vcpkg/ports/libmagic/portfile.cmake sed -i 's/vcpkg_install_make(${EXTRA_ARGS})/vcpkg_install_make(${EXTRA_ARGS} SUBPATH src)/g' /vcpkg/ports/libmagic/portfile.cmake
echo '
diff --git a/magic/Makefile.am b/magic/Makefile.am
index c2f8029f..d392be68 100644
--- a/magic/Makefile.am
+++ b/magic/Makefile.am
@@ -389,5 +389,6 @@ ${MAGIC}: $(MAGIC_FRAGMENTS) $(FILE_COMPILE_DEP)
exit 1; \
fi; \
fi)
+ chmod +x $(FILE_COMPILE) || true
$(FILE_COMPILE) -C -m magic
@rm -fr magic
' >> /vcpkg/ports/libmagic/0018-Fix-File-Executable-Flag.patch
sed -i 's/PATCHES ${PATCHES}/PATCHES \"0018-Fix-File-Executable-Flag.patch\"/g' /vcpkg/ports/libmagic/portfile.cmake
EOF EOF
# Patch vcpkg build instructions to add -pthread # Patch vcpkg build instructions to add -pthread
@@ -49,7 +35,6 @@ set -xe
mkdir -p $VCPKG_DEFAULT_BINARY_CACHE mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
/vcpkg/vcpkg update
/vcpkg/vcpkg install --triplet=wasm32-emscripten libmagic /vcpkg/vcpkg install --triplet=wasm32-emscripten libmagic
/vcpkg/vcpkg install --triplet=wasm32-emscripten freetype /vcpkg/vcpkg install --triplet=wasm32-emscripten freetype
/vcpkg/vcpkg install --triplet=wasm32-emscripten mbedtls /vcpkg/vcpkg install --triplet=wasm32-emscripten mbedtls