]> git.pld-linux.org Git - packages/criterion.git/blame - criterion-libdir.patch
- fix miscompiled library on x32
[packages/criterion.git] / criterion-libdir.patch
CommitLineData
6e470621
JB
1--- criterion-v2.3.3/src/criterion.pc.in.orig 2018-11-05 01:59:28.000000000 +0100
2+++ criterion-v2.3.3/src/criterion.pc.in 2020-04-29 21:13:27.924872823 +0200
3@@ -1,7 +1,7 @@
4 prefix=@CMAKE_INSTALL_PREFIX@
5 exec_prefix=${prefix}
6 includedir=${prefix}/include
7-libdir=${prefix}/lib
8+libdir=${prefix}/lib@LIB_SUFFIX@
9
10 Name: @PROJECT_NAME@
11 Description: A KISS, Cross platform unit testing framework for C and C++
12--- criterion-v2.3.3/src/CMakeLists.txt.orig 2018-11-05 01:59:28.000000000 +0100
13+++ criterion-v2.3.3/src/CMakeLists.txt 2020-04-29 21:14:27.667882501 +0200
14@@ -141,7 +141,7 @@
15 @ONLY
16 )
17
18-install (FILES "${CMAKE_CURRENT_BINARY_DIR}/criterion.pc" DESTINATION "share/pkgconfig")
19+install (FILES "${CMAKE_CURRENT_BINARY_DIR}/criterion.pc" DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
20
21 set (SOURCE_FILES ${SOURCE_FILES} PARENT_SCOPE)
22 set (INTERFACE_FILES ${INTERFACE_FILES} PARENT_SCOPE)
23--- criterion-v2.3.3/.cmake/Modules/PackageUtils.cmake.orig 2018-11-05 01:59:28.000000000 +0100
24+++ criterion-v2.3.3/.cmake/Modules/PackageUtils.cmake 2020-04-29 21:16:30.190552072 +0200
25@@ -51,8 +51,8 @@
26
27 install(TARGETS ${_LIB}
28 RUNTIME DESTINATION bin
29- LIBRARY DESTINATION lib
30- ARCHIVE DESTINATION lib ${install_flags}
31+ LIBRARY DESTINATION lib${LIB_SUFFIX}
32+ ARCHIVE DESTINATION lib${LIB_SUFFIX} ${install_flags}
33 )
34 endfunction ()
35
This page took 0.140308 seconds and 4 git commands to generate.