File turing-shared-libs.patch of Package turing

92
 
1
Index: turing-1.2.git.1499183039.72b085e/havoc/CMakeLists.txt
2
===================================================================
3
--- turing-1.2.git.1499183039.72b085e.orig/havoc/CMakeLists.txt
4
+++ turing-1.2.git.1499183039.72b085e/havoc/CMakeLists.txt
5
@@ -18,7 +18,7 @@ endif (MSVC)
6
 
7
 if (CMAKE_COMPILER_IS_GNUCC)
8
    set(GCC_COMPILE_FLAGS "-fno-operator-names -std=c++0x")
9
-   set(GCC_COMPILE_FLAGS "-fno-operator-names -pthread -std=c++1y")
10
+   set(GCC_COMPILE_FLAGS "-fno-operator-names -pthread")
11
    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -DNDEBUG ")
12
    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -DVALGRIND_FRIENDLY")
13
    set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${GCC_COMPILE_FLAGS}")
14
@@ -57,6 +57,10 @@ unset(CMAKE_IMPORT_LIBRARY_SUFFIX)
15
 
16
 target_link_libraries(havoc-exe havoc)
17
 
18
+set_target_properties(havoc PROPERTIES SOVERSION __SOVERSION__ VERSION __VERSION__)
19
+
20
 set_target_properties(havoc-exe PROPERTIES OUTPUT_NAME havoc)
21
 
22
-install(TARGETS havoc LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
23
+install(TARGETS havoc-exe DESTINATION bin)
24
+
25
+install(TARGETS havoc LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
26
Index: turing-1.2.git.1499183039.72b085e/havoc/transform.h
27
===================================================================
28
--- turing-1.2.git.1499183039.72b085e.orig/havoc/transform.h
29
+++ turing-1.2.git.1499183039.72b085e/havoc/transform.h
30
@@ -26,6 +26,7 @@ For more information, contact us at info
31
 
32
 #include "havoc.h"
33
 #include <cassert>
34
+#include <limits>
35
 
36
 
37
 namespace havoc {
38
Index: turing-1.2.git.1499183039.72b085e/turing/CMakeLists.txt
39
===================================================================
40
--- turing-1.2.git.1499183039.72b085e.orig/turing/CMakeLists.txt
41
+++ turing-1.2.git.1499183039.72b085e/turing/CMakeLists.txt
42
@@ -40,7 +40,7 @@ endif()
43
 set(LINK_LIBRARIES boost_program_options boost_filesystem boost_system boost_timer boost_chrono)
44
 
45
 if (CMAKE_COMPILER_IS_GNUCC)
46
-    add_compile_options(-fno-operator-names -pthread -std=c++1y)
47
+    add_compile_options(-fno-operator-names -pthread)
48
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing")
49
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -DVALGRIND_FRIENDLY")
50
     set(LINK_LIBRARIES ${LINK_LIBRARIES} -pthread rt)
51
@@ -222,6 +222,8 @@ unset(CMAKE_IMPORT_LIBRARY_SUFFIX)
52
 
53
 add_executable (turing-exe main.cpp)
54
 
55
+set_target_properties(turing PROPERTIES SOVERSION __SOVERSION__ VERSION __VERSION__)
56
+
57
 set_target_properties(turing-exe PROPERTIES OUTPUT_NAME turing)
58
 
59
 target_link_libraries (turing-exe LINK_PUBLIC turing ${LINK_LIBRARIES})
60
@@ -230,9 +232,10 @@ if(UNIX)
61
    include(FindPkgConfig QUIET)
62
    if(PKG_CONFIG_FOUND)
63
        configure_file("libturing.pc.in" "libturing.pc" @ONLY)
64
-       install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libturing.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
65
+       install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libturing.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig")
66
    endif()
67
 endif()
68
 
69
-install(TARGETS turing LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
70
+install(TARGETS turing-exe DESTINATION bin)
71
+install(TARGETS turing LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
72
 install(FILES turing.h DESTINATION include)
73
Index: turing-1.2.git.1499183039.72b085e/turing/libturing.pc.in
74
===================================================================
75
--- turing-1.2.git.1499183039.72b085e.orig/turing/libturing.pc.in
76
+++ turing-1.2.git.1499183039.72b085e/turing/libturing.pc.in
77
@@ -1,11 +1,11 @@
78
 prefix=@CMAKE_INSTALL_PREFIX@
79
 exec_prefix=${prefix}
80
-libdir=${exec_prefix}/lib
81
+libdir=${exec_prefix}/lib@LIB_SUFFIX@
82
 includedir=${prefix}/include
83
 
84
 Name: @CMAKE_PROJECT_NAME@
85
 Description: Turing codec library
86
-Version: @GIT_DESCRIBE@
87
+Version: @TURING_VERSION@
88
 Libs: -L${libdir}  -lturing -lhavoc
89
-Libs.private: -lstdc++ -L@CMAKE_INSTALL_PREFIX@/lib/boost -lboost_program_options -lboost_timer -lboost_system -lboost_filesystem -lboost_chrono
90
+Libs.private: -lstdc++ -lboost_program_options -lboost_timer -lboost_system -lboost_filesystem -lboost_chrono
91
 Cflags: -I${includedir}
92