diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
| commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
| tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-util/apitrace/files/apitrace-7.1-disable-multiarch.patch | |
| parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) | |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-util/apitrace/files/apitrace-7.1-disable-multiarch.patch')
| -rw-r--r-- | dev-util/apitrace/files/apitrace-7.1-disable-multiarch.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/dev-util/apitrace/files/apitrace-7.1-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-7.1-disable-multiarch.patch deleted file mode 100644 index 53d470d8705d..000000000000 --- a/dev-util/apitrace/files/apitrace-7.1-disable-multiarch.patch +++ /dev/null @@ -1,35 +0,0 @@ -respect the libdir cmake already set up for us instead of using debian-specific multiarch paths - ---- apitrace-7.1/CMakeLists.txt -+++ apitrace-7.1/CMakeLists.txt -@@ -359,15 +359,6 @@ - ############################################################################## - # Installation directories - --if (CMAKE_SYSTEM_NAME STREQUAL "Linux") -- # Debian multiarch support -- execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH -- OUTPUT_VARIABLE ARCH_SUBDIR -- ERROR_QUIET -- OUTPUT_STRIP_TRAILING_WHITESPACE -- ) --endif() -- - if (WIN32 OR APPLE) - # On Windows/MacOSX, applications are usually installed on a directory of - # their own -@@ -376,12 +367,8 @@ - set (LIB_ARCH_INSTALL_DIR lib) - else () - set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME}) -- set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME}) -- if (ARCH_SUBDIR) -- set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME}) -- else () -- set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME}) -- endif () -+ set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME}) -+ set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR}) - endif () - - set (SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts) |