mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-12-27 03:14:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cross-compile isn't happy with OpenSSL 3.0.2, so let's use 1.1.1n for rpi.

Browse Source
This commit is contained in:
casey langen 2022-04-29 21:09:32 -07:00
parent e9b6559525
commit 7362a7eb86
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.txt
View File

@ -14,7 +14,7 @@
* added support for the `piggy` debug tool to help with log collection and * added support for the `piggy` debug tool to help with log collection and
remote app monitoring. disabled by default. remote app monitoring. disabled by default.
* updated Linux/macOS dependencies for standalone *nix builds: boost 1.79.0, * updated Linux/macOS dependencies for standalone *nix builds: boost 1.79.0,
openssl 3.0.2, curl 7.83.0, ffmpeg 5.0.1, libopenmtp 0.6.2 openssl 3.0.2 (1.1.1n for rpi), curl 7.83.0, ffmpeg 5.0.1, libopenmtp 0.6.2
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

3
script/build-vendor-libraries.sh
View File

@ -50,6 +50,7 @@ fi
# update cross-compile vars, if specified. # update cross-compile vars, if specified.
if [[ $CROSSCOMPILE == "rpi" ]]; then if [[ $CROSSCOMPILE == "rpi" ]]; then
OPENSSL_VERSION="1.1.1n"
ARM_ROOT="/build/rpi/sysroot" ARM_ROOT="/build/rpi/sysroot"
export CPPFLAGS="-I${ARM_ROOT}/usr/include" export CPPFLAGS="-I${ARM_ROOT}/usr/include"
export CXXFLAGS="$CXXFLAGS -I${ARM_ROOT}/usr/include" export CXXFLAGS="$CXXFLAGS -I${ARM_ROOT}/usr/include"
@ -59,7 +60,7 @@ if [[ $CROSSCOMPILE == "rpi" ]]; then
GENERIC_CONFIGURE_FLAGS="--build=x86_64-pc-linux-gnu --host=arm-linux-gnueabihf --with-sysroot=${ARM_ROOT}" GENERIC_CONFIGURE_FLAGS="--build=x86_64-pc-linux-gnu --host=arm-linux-gnueabihf --with-sysroot=${ARM_ROOT}"
FFMPEG_CONFIGURE_FLAGS="--arch=${ARCH} --target-os=linux --cross-prefix=arm-linux-gnueabihf-" FFMPEG_CONFIGURE_FLAGS="--arch=${ARCH} --target-os=linux --cross-prefix=arm-linux-gnueabihf-"
BOOST_TOOLSET="toolset=gcc-arm" BOOST_TOOLSET="toolset=gcc-arm"
PKG_CONFIG_PATH="${OUTDIR}:${LIBDIR}:${LIBDIR}/pkgconfig/:${ARM_ROOT}/usr/lib/arm-linux-gnueabihf/pkgconfig/" PKG_CONFIG_PATH="${LIBDIR}/pkgconfig/:${ARM_ROOT}/usr/lib/arm-linux-gnueabihf/pkgconfig/"
printf "\n\ndetected CROSSCOMPILE=${CROSSCOMPILE}\n" printf "\n\ndetected CROSSCOMPILE=${CROSSCOMPILE}\n"
printf " CFLAGS=${CFLAGS}\n CXXFLAGS=${CXXFLAGS}\n LDFLAGS=${LDFLAGS}\n GENERIC_CONFIGURE_FLAGS=${GENERIC_CONFIGURE_FLAGS}\n" printf " CFLAGS=${CFLAGS}\n CXXFLAGS=${CXXFLAGS}\n LDFLAGS=${LDFLAGS}\n GENERIC_CONFIGURE_FLAGS=${GENERIC_CONFIGURE_FLAGS}\n"
printf " BOOST_TOOLSET=${BOOST_TOOLSET}\n OPENSSL_TYPE=${OPENSSL_TYPE}\n OPENSSL_CROSSCOMPILE_PREFIX=${OPENSSL_CROSSCOMPILE_PREFIX}\n" printf " BOOST_TOOLSET=${BOOST_TOOLSET}\n OPENSSL_TYPE=${OPENSSL_TYPE}\n OPENSSL_CROSSCOMPILE_PREFIX=${OPENSSL_CROSSCOMPILE_PREFIX}\n"