testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity

Accepting request 287297 from home:msmeissn:branches:devel:tools:building

Browse Source 
- 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
This commit is contained in:
Klaus Kämpf 2015-02-23 10:21:21 +00:00 committed by Git OBS Bridge
parent 2d6778f002
commit 3eefd9c019
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmake-fix-pie-binaries.patch Normal file
View File

@ -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()

6
cmake.changes
View File

@ -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 Thu Feb 19 15:05:10 UTC 2015 - hrvoje.senjan@gmail.com

4
cmake.spec
View File

@ -32,6 +32,9 @@ Patch2: cmake-fix-ruby-test.patch
Patch4: form.patch Patch4: form.patch
# PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs # PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs
Patch5: system-libs.patch 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: curl-devel
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -59,6 +62,7 @@ CMake is a cross-platform, open-source build system
%patch2 -p1 %patch2 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1
%build %build
export CXXFLAGS="%{optflags}" export CXXFLAGS="%{optflags}"