package/system/uci/patches/0001-build-fix-BUILD_STATIC.patch

   1 From 1c109a2247240846a853996d24305d1e3ced2581 Mon Sep 17 00:00:00 2001
   2 From: Yousong Zhou <yszhou4tech@gmail.com>
   3 Date: Sat, 4 Mar 2017 21:12:46 +0800
   4 Subject: [PATCH 1/3] build: fix BUILD_STATIC
   5
   6  - Build libuci.a in addition to libuci.so
   7  - Build uci cli utitlity statically if BUILD_STATIC is enabled
   8
   9 Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
  10 ---
  11  CMakeLists.txt | 24 ++++++++++++++++--------
  12  1 file changed, 16 insertions(+), 8 deletions(-)
  13
  14 diff --git a/CMakeLists.txt b/CMakeLists.txt
  15 index a900a15..2df6fa7 100644
  16 --- a/CMakeLists.txt
  17 +++ b/CMakeLists.txt
  18 @@ -8,12 +8,7 @@ ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -I. -DUCI_PREFIX="${CMAKE_INST
  19  OPTION(UCI_DEBUG "debugging support" OFF)
  20  OPTION(UCI_DEBUG_TYPECAST "typecast debugging support" OFF)
  21  OPTION(BUILD_LUA "build Lua binding" ON)
  22 -
  23 -IF(BUILD_STATIC)
  24 -  FIND_LIBRARY(ubox_library NAMES ubox.a)
  25 -ELSE(BUILD_STATIC)
  26 -  FIND_LIBRARY(ubox_library NAMES ubox)
  27 -ENDIF(BUILD_STATIC)
  28 +OPTION(BUILD_STATIC "statically linking uci" OFF)
  29
  30  FIND_PATH(ubox_include_dir libubox/usock.h)
  31
  32 @@ -23,13 +18,26 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${ubox_include_dir})
  33
  34  SET(LIB_SOURCES libuci.c file.c util.c delta.c parse.c blob.c)
  35
  36 +FIND_LIBRARY(ubox NAMES ubox)
  37 +IF(BUILD_STATIC)
  38 +  FIND_LIBRARY(ubox-static NAMES libubox.a)
  39 +ENDIF(BUILD_STATIC)
  40 +
  41  ADD_LIBRARY(uci SHARED ${LIB_SOURCES})
  42 -TARGET_LINK_LIBRARIES(uci ${ubox_library})
  43  SET_TARGET_PROPERTIES(uci PROPERTIES OUTPUT_NAME uci)
  44 +TARGET_LINK_LIBRARIES(uci ${ubox})
  45 +
  46 +ADD_LIBRARY(uci-static STATIC ${LIB_SOURCES})
  47 +SET_TARGET_PROPERTIES(uci-static PROPERTIES OUTPUT_NAME uci)
  48 +TARGET_LINK_LIBRARIES(uci-static ${ubox-static})
  49
  50  ADD_EXECUTABLE(cli cli.c)
  51  SET_TARGET_PROPERTIES(cli PROPERTIES OUTPUT_NAME uci)
  52 -TARGET_LINK_LIBRARIES(cli uci)
  53 +IF(BUILD_STATIC)
  54 +  TARGET_LINK_LIBRARIES(cli uci-static ${ubox-static})
  55 +ELSE(BUILD_STATIC)
  56 +  TARGET_LINK_LIBRARIES(cli uci ubox)
  57 +ENDIF(BUILD_STATIC)
  58
  59  ADD_LIBRARY(ucimap STATIC ucimap.c)
  60
  61 --
  62 2.6.4
  63