radhermit 15/01/11 19:14:31 Added: apitrace-6.0-disable-multiarch.patch Log: Version bump. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Revision Changes Path 1.1 dev-util/apitrace/files/apitrace-6.0-disable-multiarch.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/apitrace/files/apitrace-6.0-disable-multiarch.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/apitrace/files/apitrace-6.0-disable-multiarch.patch?rev=1.1&content-type=text/plain Index: apitrace-6.0-disable-multiarch.patch =================================================================== respect the libdir cmake already set up for us instead of using debian-specific multiarch paths --- apitrace-6.0/CMakeLists.txt +++ apitrace-6.0/CMakeLists.txt @@ -280,15 +280,6 @@ ############################################################################## # Installation directories -if (${CMAKE_SYSTEM_NAME} MATCHES "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 @@ -297,12 +288,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)
