moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

kconfig: fix libexecdir location

Browse source
This commit is contained in:
Đoàn Trần Công Danh 2022-11-21 17:15:11 +07:00 • committed by Đoàn Trần Công Danh
parent 22054be835
commit ef5a767ea4
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch
View file

@ -14,12 +14,12 @@ of cross-build, since these cmake directive lines are always evalued at *their*
else() else()
include("${CMAKE_CURRENT_LIST_DIR}/KF5ConfigCompilerTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/KF5ConfigCompilerTargets.cmake")
+ if(CMAKE_CROSSCOMPILING) + if(CMAKE_CROSSCOMPILING)
+ set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION_NONE /usr/lib/libexec/kf5/kconfig_compiler_kf5) + set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION_NONE /usr/libexec/kf5/kconfig_compiler_kf5)
+ set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION /usr/lib/libexec/kf5/kconfig_compiler_kf5) + set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION /usr/libexec/kf5/kconfig_compiler_kf5)
+ endif() + endif()
+ if(CMAKE_CROSSCOMPILING) + if(CMAKE_CROSSCOMPILING)
+ set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION_NONE /usr/lib/libexec/kf5/kconf_update) + set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION_NONE /usr/libexec/kf5/kconf_update)
+ set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION /usr/lib/libexec/kf5/kconf_update) + set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION /usr/libexec/kf5/kconf_update)
+ endif() + endif()
endif() endif()
include("${CMAKE_CURRENT_LIST_DIR}/KF5ConfigMacros.cmake") include("${CMAKE_CURRENT_LIST_DIR}/KF5ConfigMacros.cmake")

11
srcpkgs/kconfig/template
View file

@ -1,7 +1,7 @@
# Template file for 'kconfig' # Template file for 'kconfig'
pkgname=kconfig pkgname=kconfig
version=5.100.1 version=5.100.1
revision=1 revision=2
build_style=cmake build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel" hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
makedepends="qt5-devel qt5-tools-devel qt5-declarative-devel" makedepends="qt5-devel qt5-tools-devel qt5-declarative-devel"
@ -18,6 +18,15 @@ do_check() {
ctest -E 'kconfigcore-kconfigtest' ctest -E 'kconfigcore-kconfigtest'
} }
post_install() {
# Backward compatible symlink
vmkdir usr/lib/libexec/kf5
ln -s ../../../libexec/kf5/kconf_update \
${DESTDIR}/usr/lib/libexec/kf5
ln -s ../../../libexec/kf5/kconfig_compiler_kf5 \
${DESTDIR}/usr/lib/libexec/kf5
}
kconfig-devel_package() { kconfig-devel_package() {
short_desc+=" - development" short_desc+=" - development"
depends="${makedepends} ${sourcepkg}>=${version}_${revision}" depends="${makedepends} ${sourcepkg}>=${version}_${revision}"