PoetryInCode/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

telegram-desktop: fix cross

Browse Source 
cmake was adding some /usr/include paths to the pch which broke cross
This commit is contained in:
John 2019-06-11 17:13:37 +02:00
parent f628f959a6
commit c4a7fde878
No known key found for this signature in database
GPG Key ID: 778558807E4FFC55
3 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
srcpkgs/telegram-desktop/files/Telegram.cmake
View File

@ -148,15 +148,12 @@ set(TELEGRAM_COMPILE_DEFINITIONS
) )
set(TELEGRAM_INCLUDE_DIRS set(TELEGRAM_INCLUDE_DIRS
${FFMPEG_INCLUDE_DIRS}
${GENERATED_DIR} ${GENERATED_DIR}
${LIBDRM_INCLUDE_DIRS} ${LIBDRM_INCLUDE_DIRS}
${LIBLZMA_INCLUDE_DIRS} ${LIBLZMA_INCLUDE_DIRS}
${LIBVA_INCLUDE_DIRS}
${MINIZIP_INCLUDE_DIRS} ${MINIZIP_INCLUDE_DIRS}
${OPENAL_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR}
${QT_PRIVATE_INCLUDE_DIRS} ${QT_PRIVATE_INCLUDE_DIRS}
${RAPIDJSON_INCLUDE_DIRS}
${THIRD_PARTY_INCLUDE_DIRS} ${THIRD_PARTY_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}
) )

2
srcpkgs/telegram-desktop/files/ThirdParty-qtlottie.cmake
View File

@ -3,8 +3,6 @@ project(qtlottie)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
list(APPEND CMAKE_MODULE_PATH list(APPEND CMAKE_MODULE_PATH
${CMAKE_SOURCE_DIR}/gyp ${CMAKE_SOURCE_DIR}/gyp

5
srcpkgs/telegram-desktop/template
View File

@ -69,11 +69,6 @@ case "$XBPS_TARGET_MACHINE" in
configure_args+=" -DUSE_LIBATOMIC=ON" ;; configure_args+=" -DUSE_LIBATOMIC=ON" ;;
esac esac
case "$XBPS_TARGET_MACHINE" in
armv6l|armv7l-musl) broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/18664/steps/shell_3/logs/stdio";;
esac
nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/20192/steps/shell_3/logs/stdio"
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-devel" hostmakedepends+=" qt5-devel"
fi fi