File turing-shared-libs.patch of Package turing

File turing-shared-libs.patch of Package turing (Revision 7)

Currently displaying revision 7 , Show latest

Index: turing-1.2.git.1499183039.72b085e/havoc/CMakeLists.txt
===================================================================
--- turing-1.2.git.1499183039.72b085e.orig/havoc/CMakeLists.txt
+++ turing-1.2.git.1499183039.72b085e/havoc/CMakeLists.txt
@@ -18,7 +18,7 @@ endif (MSVC)
 
 if (CMAKE_COMPILER_IS_GNUCC)
 	set(GCC_COMPILE_FLAGS "-fno-operator-names -std=c++0x")
-	set(GCC_COMPILE_FLAGS "-fno-operator-names -pthread -std=c++1y")
+	set(GCC_COMPILE_FLAGS "-fno-operator-names -pthread")
 	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -DNDEBUG ")
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -DVALGRIND_FRIENDLY")
 	set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${GCC_COMPILE_FLAGS}")
@@ -57,6 +57,10 @@ unset(CMAKE_IMPORT_LIBRARY_SUFFIX)
 
 target_link_libraries(havoc-exe havoc)
 
+set_target_properties(havoc PROPERTIES SOVERSION __SOVERSION__ VERSION __VERSION__)
+
 set_target_properties(havoc-exe PROPERTIES OUTPUT_NAME havoc)
 
-install(TARGETS havoc LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+install(TARGETS havoc-exe DESTINATION bin)
+
+install(TARGETS havoc LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
Index: turing-1.2.git.1499183039.72b085e/turing/CMakeLists.txt
===================================================================
--- turing-1.2.git.1499183039.72b085e.orig/turing/CMakeLists.txt
+++ turing-1.2.git.1499183039.72b085e/turing/CMakeLists.txt
@@ -40,7 +40,7 @@ endif()
 set(LINK_LIBRARIES boost_program_options boost_filesystem boost_system boost_timer boost_chrono)
 
 if (CMAKE_COMPILER_IS_GNUCC)
-    add_compile_options(-fno-operator-names -pthread -std=c++1y)
+    add_compile_options(-fno-operator-names -pthread)
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -DVALGRIND_FRIENDLY")
     set(LINK_LIBRARIES ${LINK_LIBRARIES} -pthread rt)
@@ -222,6 +222,8 @@ unset(CMAKE_IMPORT_LIBRARY_SUFFIX)
 
 add_executable (turing-exe main.cpp)
 
+set_target_properties(turing PROPERTIES SOVERSION __SOVERSION__ VERSION __VERSION__)
+
 set_target_properties(turing-exe PROPERTIES OUTPUT_NAME turing)
 
 target_link_libraries (turing-exe LINK_PUBLIC turing ${LINK_LIBRARIES})
@@ -230,9 +232,10 @@ if(UNIX)
 	include(FindPkgConfig QUIET)
 	if(PKG_CONFIG_FOUND)
 		configure_file("libturing.pc.in" "libturing.pc" @ONLY)
-		install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libturing.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
+		install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libturing.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig")
 	endif()
 endif()
 
-install(TARGETS turing LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+install(TARGETS turing-exe DESTINATION bin)
+install(TARGETS turing LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
 install(FILES turing.h DESTINATION include)
Index: turing-1.2.git.1499183039.72b085e/turing/libturing.pc.in
===================================================================
--- turing-1.2.git.1499183039.72b085e.orig/turing/libturing.pc.in
+++ turing-1.2.git.1499183039.72b085e/turing/libturing.pc.in
@@ -1,11 +1,11 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/lib@LIB_SUFFIX@
 includedir=${prefix}/include
 
 Name: @CMAKE_PROJECT_NAME@
 Description: Turing codec library
-Version: @GIT_DESCRIBE@
+Version: @TURING_VERSION@
 Libs: -L${libdir}  -lturing -lhavoc
-Libs.private: -lstdc++ -L@CMAKE_INSTALL_PREFIX@/lib/boost -lboost_program_options -lboost_timer -lboost_system -lboost_filesystem -lboost_chrono
+Libs.private: -lstdc++ -lboost_program_options -lboost_timer -lboost_system -lboost_filesystem -lboost_chrono
 Cflags: -I${includedir}