From 4a678ba7f8b7007d27e8d33fd398d70ac5dd9bb21fd0275ec79bb354e3e6f777 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 13 Feb 2018 09:52:41 +0000 Subject: [PATCH] Add missing hunk to the patch OBS-URL: https://build.opensuse.org/package/show/devel:tools/pam_wrapper?expand=0&rev=14 --- ....3-build-python2-and-python3-modules.patch | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/pam_wrapper-1.0.3-build-python2-and-python3-modules.patch b/pam_wrapper-1.0.3-build-python2-and-python3-modules.patch index 6925106..97cbada 100644 --- a/pam_wrapper-1.0.3-build-python2-and-python3-modules.patch +++ b/pam_wrapper-1.0.3-build-python2-and-python3-modules.patch @@ -1,7 +1,36 @@ +From 9beb9f9aaa223864128fd8222f0f92ba8ae697b7 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Wed, 22 Nov 2017 15:27:44 +0100 +Subject: [PATCH 1/2] cmake: Improve PAM_WRAPPER_LOACATION + +Signed-off-by: Andreas Schneider +Reviewed-by: Ralph Boehme +--- + src/CMakeLists.txt | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 713625b..76a87d6 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -74,8 +74,4 @@ if (PYTHONLIBS_FOUND) + endif() + + # This needs to be at the end +-if (POLICY CMP0026) +- cmake_policy(SET CMP0026 OLD) +-endif() +-get_target_property(PAM_WRAPPER_LOCATION pam_wrapper LOCATION) +-set(PAM_WRAPPER_LOCATION ${PAM_WRAPPER_LOCATION} PARENT_SCOPE) ++set(PAM_WRAPPER_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}pam_wrapper${CMAKE_SHARED_LIBRARY_SUFFIX}" PARENT_SCOPE) +-- +2.16.1 + + From 5c36d4284918a3fcc1c58f29f01ca64c65a66fa7 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 12 Feb 2018 12:01:22 +0100 -Subject: [PATCH] cmake: Build python2 and python3 modules if possible +Subject: [PATCH 2/2] cmake: Build python2 and python3 modules if possible Signed-off-by: Andreas Schneider Reviewed-by: Ralph Boehme