File tree Expand file tree Collapse file tree 13 files changed +30
-5
lines changed Expand file tree Collapse file tree 13 files changed +30
-5
lines changed Original file line number Diff line number Diff line change @@ -84,6 +84,9 @@ elif [ "$DARWIN" = true ]; then
84
84
export MAKEFLAGS=" -j$( sysctl -n hw.logicalcpu) "
85
85
fi
86
86
87
+ # Expose target sysroot to CMake
88
+ export TARGET_SYSROOT=" ${TARGET} "
89
+
87
90
# Optimise Rust code for binary size
88
91
export CARGO_PROFILE_RELEASE_DEBUG=false
89
92
export CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1
@@ -196,6 +199,8 @@ make install/strip
196
199
mkdir ${DEPS} /jpeg
197
200
$CURL https://github.com/mozilla/mozjpeg/archive/v${VERSION_MOZJPEG} .tar.gz | tar xzC ${DEPS} /jpeg --strip-components=1
198
201
cd ${DEPS} /jpeg
202
+ # [PATCH] BUILD: Silence CMake 3.28.x deprecation warning
203
+ $CURL https://github.com/mozilla/mozjpeg/commit/1644bdb7d2fac66cd0ce25adef7754e008b5bc1e.patch | patch -p1
199
204
cmake -G" Unix Makefiles" \
200
205
-DCMAKE_TOOLCHAIN_FILE=${ROOT} /Toolchain.cmake -DCMAKE_INSTALL_PREFIX=${TARGET} -DCMAKE_INSTALL_LIBDIR:PATH=lib -DCMAKE_BUILD_TYPE=MinSizeRel \
201
206
-DENABLE_STATIC=TRUE -DENABLE_SHARED=FALSE -DWITH_JPEG8=1 -DWITH_TURBOJPEG=FALSE -DPNG_SUPPORTED=FALSE
Original file line number Diff line number Diff line change @@ -49,7 +49,7 @@ version_latest "proxy-libintl" "$VERSION_PROXY_LIBINTL" "frida/proxy-libintl"
49
49
version_latest " rsvg" " $VERSION_RSVG " " 5420" " unstable"
50
50
version_latest " spng" " $VERSION_SPNG " " randy408/libspng"
51
51
version_latest " tiff" " $VERSION_TIFF " " 1738"
52
- version_latest " vips" " $VERSION_VIPS " " 5097"
52
+ # version_latest "vips" "$VERSION_VIPS" "5097" # Temporarily disabled to allow version 8.17.2 to roll in
53
53
version_latest " webp" " $VERSION_WEBP " " 1761"
54
54
version_latest " xml2" " $VERSION_XML2 " " 1783"
55
55
version_latest " zlib-ng" " $VERSION_ZLIB_NG " " 115592"
Original file line number Diff line number Diff line change @@ -4,6 +4,8 @@ SET(CMAKE_CXX_COMPILER clang++)
4
4
# macOS 11 Big Sur is the first version to support ARM-based macs
5
5
SET (CMAKE_OSX_DEPLOYMENT_TARGET 11.0)
6
6
7
+ set (CMAKE_FIND_ROOT_PATH $ENV{TARGET_SYSROOT} )
7
8
set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
8
9
set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
9
10
set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
11
+ set (CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
Original file line number Diff line number Diff line change @@ -4,6 +4,8 @@ SET(CMAKE_CXX_COMPILER clang++)
4
4
# Earliest supported version of macOS
5
5
SET (CMAKE_OSX_DEPLOYMENT_TARGET 10.15)
6
6
7
+ set (CMAKE_FIND_ROOT_PATH $ENV{TARGET_SYSROOT} )
7
8
set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
8
9
set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
9
10
set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
11
+ set (CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
Original file line number Diff line number Diff line change
1
+ set (CMAKE_FIND_ROOT_PATH $ENV{TARGET_SYSROOT} )
1
2
set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
2
3
set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
3
4
set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
5
+ set (CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
Original file line number Diff line number Diff line change @@ -8,6 +8,8 @@ SET(CMAKE_AR arm-rpi-linux-gnueabihf-ar)
8
8
SET (CMAKE_STRIP arm-rpi-linux-gnueabihf-strip)
9
9
SET (CMAKE_RANLIB arm-rpi-linux-gnueabihf-ranlib)
10
10
11
+ set (CMAKE_FIND_ROOT_PATH $ENV{TARGET_SYSROOT} )
11
12
set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
12
13
set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
13
14
set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
15
+ set (CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
Original file line number Diff line number Diff line change @@ -10,6 +10,8 @@ SET(CMAKE_RANLIB powerpc64le-linux-gnu-gcc-ranlib)
10
10
11
11
#SET(CMAKE_CROSSCOMPILING_EMULATOR qemu-ppc64le-static)
12
12
13
+ set (CMAKE_FIND_ROOT_PATH $ENV{TARGET_SYSROOT} )
13
14
set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
14
15
set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
15
16
set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
17
+ set (CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
Original file line number Diff line number Diff line change @@ -8,6 +8,8 @@ SET(CMAKE_AR riscv64-linux-gnu-gcc-ar)
8
8
SET (CMAKE_STRIP riscv64-linux-gnu-gcc-strip)
9
9
SET (CMAKE_RANLIB riscv64-linux-gnu-gcc-ranlib)
10
10
11
+ set (CMAKE_FIND_ROOT_PATH $ENV{TARGET_SYSROOT} )
11
12
set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
12
13
set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
13
14
set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
15
+ set (CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
Original file line number Diff line number Diff line change @@ -10,6 +10,8 @@ SET(CMAKE_RANLIB s390x-linux-gnu-gcc-ranlib)
10
10
11
11
#SET(CMAKE_CROSSCOMPILING_EMULATOR qemu-s390x-static)
12
12
13
+ set (CMAKE_FIND_ROOT_PATH $ENV{TARGET_SYSROOT} )
13
14
set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
14
15
set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
15
16
set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
17
+ set (CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
Original file line number Diff line number Diff line change
1
+ set (CMAKE_FIND_ROOT_PATH $ENV{TARGET_SYSROOT} )
1
2
set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
2
3
set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
3
4
set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
5
+ set (CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
You can’t perform that action at this time.
0 commit comments