blob: c9c88b93028a4ff7a4a051cdd409468c09251054 [file] [log] [blame]
Andrew Geisslerf1e44062021-04-15 15:52:46 -05001Issue with rpath including /usr/lib and crosscompile checkes causing oe configure to fail
2
3Use oe's cmake rpath framework and exclude some of the cmake checks that fail in our env
4
5Upstream-Status: Inappropriate [configuration]
6Singed-off-by: Armin Kuster <akuster808@gmail.com>
7
8Index: git/CMakeLists.txt
9===================================================================
10--- git.orig/CMakeLists.txt
11+++ git/CMakeLists.txt
12@@ -162,12 +162,6 @@ endif()
13
14 include(GNUInstallDirs)
15
16-if(CMAKE_INSTALL_FULL_LIBDIR)
17- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
18-else()
19- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
20-endif()
21-
22 if(C_LINUX)
23 if(CMAKE_COMPILER_IS_GNUCXX)
24 # Set _GNU_SOURCE for O_LARGEFILE, O_CLOEXEC, O_DIRECTORY, O_NOFOLLOW, etc flags on older systems
Patrick Williams213cb262021-08-07 19:21:33 -050025@@ -581,14 +575,8 @@ include(TestInline)
Andrew Geisslerf1e44062021-04-15 15:52:46 -050026 include(CheckFileOffsetBits)
27 # Determine how to pack structs on this platform.
28 include(CheckStructPacking)
29-# Check for signed right shift implementation.
30-include(CheckSignedRightShift)
31 # Check if systtem fts implementation available
32 include(CheckFTS)
33-# Check if uname(2) follows POSIX standard.
34-include(CheckUnamePosix)
35-# Check support for file descriptor passing
36-include(CheckFDPassing)
37
38 # Check if big-endian
39 include(TestBigEndian)