diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2016-03-02 21:25:00 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-03-02 21:25:00 +0100 |
| commit | 28cd1ed30aa4959c744ee37a6070cf22a66fb31f (patch) | |
| tree | fe08f3fdff6fe458a3a21cf814f12ed6c7ba54e4 /package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch | |
| parent | 13222c07293becaefc69c46c8f90b04ddc7023d9 (diff) | |
| parent | 2dfabd10d1e484d84c0e6b5a58ab43d131ca3230 (diff) | |
| download | buildroot-28cd1ed30aa4959c744ee37a6070cf22a66fb31f.tar.gz buildroot-28cd1ed30aa4959c744ee37a6070cf22a66fb31f.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch')
| -rw-r--r-- | package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch b/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch index 261c486657..53decca649 100644 --- a/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch +++ b/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch @@ -1,8 +1,10 @@ -From bb4fb7ff71fd6cadd9c1bf8716845a91e5998c0c Mon Sep 17 00:00:00 2001 -From: Samuel Martin <s.martin49@gmail.com> -Date: Sun, 31 Aug 2014 00:39:11 +0200 -Subject: [PATCH 2/2] cmake: disable shared library build when - BUILD_SHARED_LIBS is off +From b3cddf92adacfe5ca40574afb3e323cc7cdebc5c Mon Sep 17 00:00:00 2001 +From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> +Date: Tue, 2 Feb 2016 15:46:09 +0100 +Subject: [PATCH] cmake: Add shared library conditonnal build + +When BUILD_SHARED_LIBS is off, you don't want to build the shared +library. Signed-off-by: Samuel Martin <s.martin49@gmail.com> --- @@ -10,7 +12,7 @@ Signed-off-by: Samuel Martin <s.martin49@gmail.com> 1 file changed, 4 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e36b736..6a24424 100644 +index 99cf9e9..9e9c77d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,6 +37,7 @@ SET(LIBRARY_OUTPUT_PATH ${libDir}) @@ -29,16 +31,19 @@ index e36b736..6a24424 100644 #### build up an sdk as a post build step -@@ -78,7 +80,9 @@ INCLUDE_DIRECTORIES(${incDir}/..) - IF(NOT WIN32) - # at build time you may specify the cmake variable LIB_SUFFIX to handle - # 64-bit systems which use 'lib64' -+ IF(BUILD_SHARED_LIBS) - INSTALL(TARGETS yajl LIBRARY DESTINATION lib${LIB_SUFFIX}) -+ ENDIF(BUILD_SHARED_LIBS) - INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX}) - INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl) - INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl) +@@ -77,10 +79,12 @@ INCLUDE_DIRECTORIES(${incDir}/..) + + # at build time you may specify the cmake variable LIB_SUFFIX to handle + # 64-bit systems which use 'lib64' ++IF(BUILD_SHARED_LIBS) + INSTALL(TARGETS yajl + RUNTIME DESTINATION lib${LIB_SUFFIX} + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) ++ENDIF(BUILD_SHARED_LIBS) + INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX}) + INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl) + INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl) -- -2.1.0 +2.7.0 |
