From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C172E138350 for ; Sun, 5 Apr 2020 16:11:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED2CDE0A95; Sun, 5 Apr 2020 16:11:45 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C6D3DE0A95 for ; Sun, 5 Apr 2020 16:11:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 340F034EF6C for ; Sun, 5 Apr 2020 16:11:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 16658162 for ; Sun, 5 Apr 2020 16:11:42 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1586092862.c7c1240b2a698ea660eda88300c76e27b2ccb78f.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: sys-auth/AusweisApp2/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sys-auth/AusweisApp2/files/1.20.0-fix-Install.cmake.patch X-VCS-Directories: sys-auth/AusweisApp2/files/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: c7c1240b2a698ea660eda88300c76e27b2ccb78f X-VCS-Branch: master Date: Sun, 5 Apr 2020 16:11:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ebe6b093-269e-4a6b-bee7-979be1149e94 X-Archives-Hash: c5f0dc144fcdee60a4eedfc48b84113b commit: c7c1240b2a698ea660eda88300c76e27b2ccb78f Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sun Apr 5 10:24:10 2020 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Sun Apr 5 13:21:02 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c7c1240b sys-auth/AusweisApp2: change patch Install shared libs only if the were built Move insertion to IF(BUILD_SHARED_LIBS) Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> .../files/1.20.0-fix-Install.cmake.patch | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sys-auth/AusweisApp2/files/1.20.0-fix-Install.cmake.patch b/sys-auth/AusweisApp2/files/1.20.0-fix-Install.cmake.patch index 5948ded..9a18e86 100644 --- a/sys-auth/AusweisApp2/files/1.20.0-fix-Install.cmake.patch +++ b/sys-auth/AusweisApp2/files/1.20.0-fix-Install.cmake.patch @@ -1,18 +1,18 @@ diff --git a/cmake/Install.cmake b/cmake/Install.cmake -index a13e029..1fa852d 100644 +index a13e029..336785c 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake -@@ -274,6 +274,13 @@ ELSEIF(UNIX) +@@ -269,6 +269,13 @@ ELSEIF(ANDROID) + ELSEIF(UNIX) + IF(BUILD_SHARED_LIBS) + SET(CMAKE_INSTALL_RPATH "\$ORIGIN") ++ INSTALL(TARGETS AusweisAppActivation AusweisAppActivationCustomScheme AusweisAppActivationIntent ++ AusweisAppActivationInternal AusweisAppActivationWebservice AusweisAppCard AusweisAppCardDrivers ++ AusweisAppCardPcsc AusweisAppConfiguration AusweisAppCore AusweisAppExport AusweisAppFileProvider ++ AusweisAppGlobal AusweisAppInit AusweisAppNetwork AusweisAppRemoteDevice AusweisAppSecureStorage ++ AusweisAppServices AusweisAppSettings AusweisAppUi AusweisAppUiAidl AusweisAppUiCommon ++ AusweisAppUiJson AusweisAppUiQml AusweisAppUiWebsocket AusweisAppUiWidget AusweisAppWhitelistClient ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL) + ENDIF() + SET(DEFAULT_FILE_DESTINATION ${CMAKE_INSTALL_DATADIR}/${VENDOR}/AusweisApp2) - SET(TRANSLATION_DESTINATION ${DEFAULT_FILE_DESTINATION}/${TRANSLATION_DESTINATION}) - INSTALL(TARGETS AusweisApp DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Application) -+ INSTALL(TARGETS AusweisAppActivation AusweisAppActivationCustomScheme AusweisAppActivationIntent -+ AusweisAppActivationInternal AusweisAppActivationWebservice AusweisAppCard AusweisAppCardDrivers -+ AusweisAppCardPcsc AusweisAppConfiguration AusweisAppCore AusweisAppExport AusweisAppFileProvider -+ AusweisAppGlobal AusweisAppInit AusweisAppNetwork AusweisAppRemoteDevice AusweisAppSecureStorage -+ AusweisAppServices AusweisAppSettings AusweisAppUi AusweisAppUiAidl AusweisAppUiCommon -+ AusweisAppUiJson AusweisAppUiQml AusweisAppUiWebsocket AusweisAppUiWidget AusweisAppWhitelistClient -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL) - CONFIGURE_FILE(${PACKAGING_DIR}/linux/${BUNDLE_IDENTIFIER}.metainfo.xml.in ${CMAKE_CURRENT_BINARY_DIR}/${BUNDLE_IDENTIFIER}.metainfo.xml @ONLY) - CONFIGURE_FILE(${PACKAGING_DIR}/linux/${BUNDLE_IDENTIFIER}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${BUNDLE_IDENTIFIER}.desktop @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BUNDLE_IDENTIFIER}.metainfo.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo COMPONENT Application)