jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

stlink: fix cross-build

Browse source
This commit is contained in:
Enno Boland 2018-10-18 19:16:52 +02:00
parent ff1c1cb18f
commit 783d017597
No known key found for this signature in database
GPG key ID: D09964719BDE9971
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
srcpkgs/stlink/patches/enable-cross-gtk.patch Normal file
View file

@ -0,0 +1,21 @@
commit 850c646b0b150f9e2efc0f8d2ee93241fd19db79
Author: Enno Boland <g@s01.de>
Date: Thu Oct 18 19:14:08 2018 +0200
Revert "skip GTK detection if we're cross-compiling (#588)"
This reverts commit cc3a5705099019e01dc59f7907d0c5b1b85878d8.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 395848b..39c23b0 100644
--- ./CMakeLists.txt
+++ ./CMakeLists.txt
@@ -39,7 +39,7 @@ endif()
# Dependencies
###
find_package(LibUSB REQUIRED)
-if (NOT APPLE AND NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
+if (NOT APPLE AND NOT WIN32)
find_package(PkgConfig)
pkg_check_modules(gtk gtk+-3.0)
endif ()

2
srcpkgs/stlink/template
View file

@ -1,7 +1,7 @@
# Template file for 'stlink' # Template file for 'stlink'
pkgname=stlink pkgname=stlink
version=1.5.1 version=1.5.1
revision=1 revision=2
build_style=cmake build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d -DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d" configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d -DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d"
hostmakedepends="pkg-config" hostmakedepends="pkg-config"