[packages/osquery] build with system cpp-netlib

glen glen at pld-linux.org
Sat Aug 1 22:13:49 CEST 2015


commit 8457c22c79497339ce749124a07b80afeb2c36af
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Aug 1 20:19:45 2015 +0300

    build with system cpp-netlib

 osquery.spec            |  3 +++
 system-cpp-netlib.patch | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
---
diff --git a/osquery.spec b/osquery.spec
index 2214ab6..142cac6 100644
--- a/osquery.spec
+++ b/osquery.spec
@@ -10,12 +10,14 @@ Source1:	https://github.com/osquery/third-party/archive/%{version}/%{name}-third
 # Source1-md5:	40da5c78ae344d5869fa5ef0e3946246
 Patch1:		gcc-flags.patch
 Patch2:		system-glog.patch
+Patch3:		system-cpp-netlib.patch
 URL:		https://osquery.io/
 BuildRequires:	bison
 BuildRequires:	boost-devel >= 1.55.0
 BuildRequires:	byacc
 BuildRequires:	bzip2-devel
 BuildRequires:	cmake
+BuildRequires:	cpp-netlib-devel >= 0.11.0
 BuildRequires:	cryptsetup-devel >= 1.6.7
 BuildRequires:	device-mapper-devel
 BuildRequires:	doxygen
@@ -62,6 +64,7 @@ network connections, browser plugins, hardware events or file hashes.
 %setup -q -a1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 mv third-party-*/* third-party
 
diff --git a/system-cpp-netlib.patch b/system-cpp-netlib.patch
new file mode 100644
index 0000000..06a7dae
--- /dev/null
+++ b/system-cpp-netlib.patch
@@ -0,0 +1,25 @@
+--- osquery-1.5.1/CMake/FindCppNetlib.cmake~	2015-07-27 04:11:42.000000000 +0300
++++ osquery-1.5.1/CMake/FindCppNetlib.cmake	2015-08-01 20:15:27.226849878 +0300
+@@ -1,19 +1,6 @@
+-set(CPP-NETLIB_SOURCE_DIR "${CMAKE_SOURCE_DIR}/third-party/cpp-netlib")
+-set(CPP-NETLIB_BUILD_DIR "${CMAKE_BINARY_DIR}/third-party/cpp-netlib")
+-
+-# Only build the cpp-netlib shared library.
+-set(CPP-NETLIB_BUILD_TESTS OFF CACHE BOOL "")
+-set(CPP-NETLIB_BUILD_EXAMPLES OFF CACHE BOOL "")
+-set(CPP-NETLIB_BUILD_SHARED_LIBS OFF CACHE BOOL "")
+-
+-include_directories("${CPP-NETLIB_SOURCE_DIR}")
+-add_subdirectory("${CPP-NETLIB_SOURCE_DIR}")
+-
+-set(CPP-NETLIB_LINK_DIR "${CPP-NETLIB_BUILD_DIR}/libs/network/src")
+ set(CPP-NETLIB_LIBRARY
+-  "${CPP-NETLIB_LINK_DIR}/libcppnetlib-uri.a"
+-  "${CPP-NETLIB_LINK_DIR}/libcppnetlib-client-connections.a"
++  "${CMAKE_INSTALL_LIBDIR}/libcppnetlib-uri.so"
++  "${CMAKE_INSTALL_LIBDIR}/libcppnetlib-client-connections.so"
+ )
+ 
+-LOG_LIBRARY(cpp-netlib "${CPP-NETLIB_LINK_DIR}/libcppnetlib-uri.a")
+-LOG_LIBRARY(cpp-netlib "${CPP-NETLIB_LINK_DIR}/libcppnetlib-client-connections.a")
++LOG_LIBRARY(cpp-netlib "${CPP-NETLIB_LIBRARY}")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/osquery.git/commitdiff/a8cd726f00624b7c0381183e68dbaf32ad52471e



More information about the pld-cvs-commit mailing list