The cirros image was rebuilt against the 3.13.0-83 kernel, drivers e1000e, igbvf...
[packages/trusty/cirros-testvm.git] / cirros-testvm / src-cirros / buildroot-2015.05 / package / yajl / 0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch
1 From bb4fb7ff71fd6cadd9c1bf8716845a91e5998c0c Mon Sep 17 00:00:00 2001
2 From: Samuel Martin <s.martin49@gmail.com>
3 Date: Sun, 31 Aug 2014 00:39:11 +0200
4 Subject: [PATCH 2/2] cmake: disable shared library build when
5  BUILD_SHARED_LIBS is off
6
7 Signed-off-by: Samuel Martin <s.martin49@gmail.com>
8 ---
9  src/CMakeLists.txt | 4 ++++
10  1 file changed, 4 insertions(+)
11
12 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
13 index e36b736..6a24424 100644
14 --- a/src/CMakeLists.txt
15 +++ b/src/CMakeLists.txt
16 @@ -37,6 +37,7 @@ SET(LIBRARY_OUTPUT_PATH ${libDir})
17  
18  ADD_LIBRARY(yajl_s STATIC ${SRCS} ${HDRS} ${PUB_HDRS})
19  
20 +IF(BUILD_SHARED_LIBS)
21  ADD_LIBRARY(yajl SHARED ${SRCS} ${HDRS} ${PUB_HDRS})
22  
23  #### setup shared library version number
24 @@ -51,6 +52,7 @@ IF(APPLE)
25    SET_TARGET_PROPERTIES(yajl PROPERTIES
26                          INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
27  ENDIF(APPLE)
28 +ENDIF(BUILD_SHARED_LIBS)
29  
30  #### build up an sdk as a post build step
31  
32 @@ -78,7 +80,9 @@ INCLUDE_DIRECTORIES(${incDir}/..)
33  IF(NOT WIN32)
34    # at build time you may specify the cmake variable LIB_SUFFIX to handle
35    # 64-bit systems which use 'lib64'
36 +  IF(BUILD_SHARED_LIBS)
37    INSTALL(TARGETS yajl LIBRARY DESTINATION lib${LIB_SUFFIX})
38 +  ENDIF(BUILD_SHARED_LIBS)
39    INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX})
40    INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl)
41    INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl)
42 -- 
43 2.1.0
44