mirror of
https://github.com/vanilla-wiiu/vanilla.git
synced 2026-10-28 09:43:51 +00:00
improve cross compiling behavior
This commit is contained in:
1 parent
e45f4448ae
commit
eb74b23893
4 files changed
+18
-5
No files matched your search
@@ -4,7 +4,7 @@ EXTRA_CMAKE_FLAGS=
|
||||
|
||||
if [ "$ARCH" = "aarch64" ]
|
||||
then
|
||||
EXTRA_CMAKE_FLAGS="-DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR=aarch64 -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_CROSS_PREFIX=aarch64-linux-gnu-"
|
||||
EXTRA_CMAKE_FLAGS="-DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR=aarch64 -DCMAKE_SYSTEM_NAME=Linux"
|
||||
export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
|
||||
export PATH=$PATH:/usr/lib/aarch64-linux-gnu
|
||||
export CC=aarch64-linux-gnu-gcc
|
||||
|
||||
@@ -28,7 +28,7 @@ if (VANILLA_BUILD_VENDORED)
|
||||
BINARY_DIR ${OPENSSL_DIR}
|
||||
GIT_REPOSITORY https://github.com/openssl/openssl.git
|
||||
GIT_TAG openssl-3.5.0
|
||||
CONFIGURE_COMMAND ./Configure --prefix=${OPENSSL_INSTALL_DIR} linux-${OPENSSL_PROCESSOR}
|
||||
CONFIGURE_COMMAND env CC=${CMAKE_C_COMPILER} ./Configure --prefix=${OPENSSL_INSTALL_DIR} linux-${OPENSSL_PROCESSOR} no-apps no-docs no-quic no-http
|
||||
UPDATE_COMMAND ""
|
||||
# BUILD_BYPRODUCTS
|
||||
# ${WPA_SUPPLICANT_BYPRODUCTS}
|
||||
@@ -163,12 +163,21 @@ foreach(_wpa_supplicant_obj ${WPA_SUPPLICANT_OBJECTS})
|
||||
list(APPEND WPA_SUPPLICANT_BYPRODUCTS "${_wpa_supplicant_obj_path}")
|
||||
endforeach()
|
||||
|
||||
set(HOSTAP_ENV
|
||||
CC=${CMAKE_C_COMPILER}
|
||||
)
|
||||
if (VANILLA_BUILD_VENDORED)
|
||||
list(APPEND HOSTAP_ENV
|
||||
PKG_CONFIG_PATH=${LIBNL_INSTALL_DIR}/lib/pkgconfig
|
||||
CFLAGS="-I${LIBNL_INSTALL_DIR}/include/libnl3"
|
||||
)
|
||||
endif()
|
||||
ExternalProject_Add(hostap
|
||||
SOURCE_DIR ${HOSTAP_DIR}
|
||||
BINARY_DIR ${HOSTAP_DIR}
|
||||
GIT_REPOSITORY https://github.com/rolandoislas/drc-hostap.git
|
||||
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy_if_different conf/wpa_supplicant.config wpa_supplicant/.config
|
||||
BUILD_COMMAND make -C wpa_supplicant -j${CMAKE_BUILD_PARALLEL_LEVEL} wpa_supplicant libwpa_client.a
|
||||
BUILD_COMMAND env ${HOSTAP_ENV} make -C wpa_supplicant -j${CMAKE_BUILD_PARALLEL_LEVEL} wpa_supplicant libwpa_client.a
|
||||
INSTALL_COMMAND ""
|
||||
UPDATE_COMMAND ""
|
||||
BUILD_BYPRODUCTS
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
#include <arpa/inet.h>
|
||||
#include <errno.h>
|
||||
#include <libgen.h>
|
||||
#include <linux/version.h>
|
||||
#include <net/if.h>
|
||||
#include <netlink/route/addr.h>
|
||||
#include <pthread.h>
|
||||
@@ -334,8 +335,10 @@ void dhcp_callback(const char *type, char **env, void *data)
|
||||
struct nl_msg *msg;
|
||||
rtnl_addr_build_add_request(ra, 0, &msg);
|
||||
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,18,00)
|
||||
// Make this route the lowest possible priority so the system doesn't favor it over other connections
|
||||
nla_put_u32(msg, IFA_RT_PRIORITY, UINT32_MAX);
|
||||
#endif
|
||||
|
||||
// Send request
|
||||
nl_send_auto_complete(nl, msg);
|
||||
|
||||
+3
-2
@@ -27,7 +27,8 @@ function(compile_ffmpeg _target_name _system_name _system_processor)
|
||||
--enable-decoder=h264
|
||||
--enable-encoder=png
|
||||
)
|
||||
if (CMAKE_CROSSCOMPILING)
|
||||
if (NOT "${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "${_system_processor}"
|
||||
OR NOT "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "${_system_name}")
|
||||
set(FFMPEG_TARGET_OS ${_system_name})
|
||||
set(FFMPEG_ENV "")
|
||||
if (MINGW)
|
||||
@@ -95,7 +96,7 @@ function(compile_ffmpeg _target_name _system_name _system_processor)
|
||||
elseif(LINUX)
|
||||
set(FFMPEG_TARGET_OS "linux")
|
||||
list(APPEND FFMPEG_CONFIGURE_ARGS
|
||||
--cross-prefix=${CMAKE_CROSS_PREFIX}
|
||||
--cross-prefix=${_system_processor}-linux-gnu-
|
||||
--host-cc=${CMAKE_C_COMPILER}
|
||||
)
|
||||
endif()
|
||||
|
||||
Reference in new issue
Block a user