| Andrew Geissler | f1e4406 | 2021-04-15 15:52:46 -0500 | [diff] [blame^] | 1 | Issue with rpath including /usr/lib and crosscompile checkes causing oe configure to fail |
| 2 | |
| 3 | Use oe's cmake rpath framework and exclude some of the cmake checks that fail in our env |
| 4 | |
| 5 | Upstream-Status: Inappropriate [configuration] |
| 6 | Singed-off-by: Armin Kuster <akuster808@gmail.com> |
| 7 | |
| 8 | Index: 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 |
| 25 | @@ -512,14 +506,8 @@ include(TestInline) |
| 26 | 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) |