From ef5a767ea4ec035496fe4a58f674f62323205a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 21 Nov 2022 17:15:11 +0700 Subject: [PATCH] kconfig: fix libexecdir location --- .../add-crossbuild-support-for-its-tools.patch | 8 ++++---- srcpkgs/kconfig/template | 11 ++++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch b/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch index 83dbe2be923..081d23ac9a3 100644 --- a/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch +++ b/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch @@ -14,12 +14,12 @@ of cross-build, since these cmake directive lines are always evalued at *their* else() include("${CMAKE_CURRENT_LIST_DIR}/KF5ConfigCompilerTargets.cmake") + 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 /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/libexec/kf5/kconfig_compiler_kf5) + endif() + 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 /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/libexec/kf5/kconf_update) + endif() endif() include("${CMAKE_CURRENT_LIST_DIR}/KF5ConfigMacros.cmake") diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template index ddf3d433777..554c82a1c25 100644 --- a/srcpkgs/kconfig/template +++ b/srcpkgs/kconfig/template @@ -1,7 +1,7 @@ # Template file for 'kconfig' pkgname=kconfig version=5.100.1 -revision=1 +revision=2 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel" makedepends="qt5-devel qt5-tools-devel qt5-declarative-devel" @@ -18,6 +18,15 @@ do_check() { 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() { short_desc+=" - development" depends="${makedepends} ${sourcepkg}>=${version}_${revision}"