From 3eefd9c019414b7cf31abbfbe35034d318ac7d0e133f9f4fb46c0f91bcf01754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.com>
Date: Mon, 23 Feb 2015 10:21:21 +0000
Subject: [PATCH] Accepting request 287297 from
 home:msmeissn:branches:devel:tools:building

- cmake-fix-pie-binaries.patch: fix the PIE binaries check for
  newer file versions

OBS-URL: https://build.opensuse.org/request/show/287297
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=198
---
 cmake-fix-pie-binaries.patch | 18 ++++++++++++++++++
 cmake.changes                |  6 ++++++
 cmake.spec                   |  4 ++++
 3 files changed, 28 insertions(+)
 create mode 100644 cmake-fix-pie-binaries.patch

diff --git a/cmake-fix-pie-binaries.patch b/cmake-fix-pie-binaries.patch
new file mode 100644
index 0000000..6a8c2b8
--- /dev/null
+++ b/cmake-fix-pie-binaries.patch
@@ -0,0 +1,18 @@
+Index: cmake-3.2.0-rc1/Modules/GetPrerequisites.cmake
+===================================================================
+--- cmake-3.2.0-rc1.orig/Modules/GetPrerequisites.cmake
++++ cmake-3.2.0-rc1/Modules/GetPrerequisites.cmake
+@@ -260,6 +260,13 @@ function(is_file_executable file result_
+         return()
+       endif()
+ 
++      # newer file version does not use (used shared libraries)
++      # but uses interpreter
++      if("${file_ov}" MATCHES "shared object.*interpreter")
++        set(${result_var} 1 PARENT_SCOPE)
++        return()
++      endif()
++
+     else()
+       message(STATUS "warning: No 'file' command, skipping execute_process...")
+     endif()
diff --git a/cmake.changes b/cmake.changes
index a73a877..63b6582 100644
--- a/cmake.changes
+++ b/cmake.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb 23 09:21:55 UTC 2015 - meissner@suse.com
+
+- cmake-fix-pie-binaries.patch: fix the PIE binaries check for
+  newer file versions
+
 -------------------------------------------------------------------
 Thu Feb 19 15:05:10 UTC 2015 - hrvoje.senjan@gmail.com
 
diff --git a/cmake.spec b/cmake.spec
index e56bae6..7b292eb 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -32,6 +32,9 @@ Patch2:         cmake-fix-ruby-test.patch
 Patch4:         form.patch
 # PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs
 Patch5:         system-libs.patch
+# PATCH-FIX-UPSTREAM cmake-fix-pie-binaries.patch -- new "file" is reporting PIE binaries a bit differently
+# I sent this by email to cmake-developers.
+Patch6:         cmake-fix-pie-binaries.patch
 BuildRequires:  curl-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -59,6 +62,7 @@ CMake is a cross-platform, open-source build system
 %patch2 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 export CXXFLAGS="%{optflags}"