unarchive: fix possible segmentation fault in deb_extract()

[oweals/opkg-lede.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e657f54c32e77497f837d2a69fae1fb3a9821bb3..9d022e0c6bc1d8599854dec6879ca82aa195d428 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,9 +5,11 @@ PROJECT(opkg C)
 SET(HOST_CPU "" CACHE STRING "Override Host CPU")
 SET(BUILD_CPU "" CACHE STRING "Override Host CPU")
 SET(LOCK_FILE "/var/lock/opkg.lock" CACHE STRING "Override lock file path")
+SET(VERSION "" CACHE STRING "Override version")
 
 OPTION(STATIC_UBOX "Statically link libubox" OFF)
 OPTION(BUILD_TESTS "Build test programs" ON)
+OPTION(ENABLE_USIGN "Enable usign support" ON)
 
 IF(NOT HOST_CPU)
        SET(HOST_CPU "${CMAKE_HOST_SYSTEM_PROCESSOR}")
@@ -17,13 +19,15 @@ IF(NOT BUILD_CPU)
        SET(BUILD_CPU "${CMAKE_SYSTEM_PROCESSOR}")
 ENDIF()
 
-EXECUTE_PROCESS(COMMAND git log -1 "--format=%h (%ci)"
-       OUTPUT_VARIABLE GIT_VERSION
-       OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+IF(NOT VERSION)
+       EXECUTE_PROCESS(COMMAND git log -1 "--format=%h (%ci)"
+               OUTPUT_VARIABLE VERSION
+               OUTPUT_STRIP_TRAILING_WHITESPACE
+       )
+ENDIF()
 
-IF(NOT GIT_VERSION)
-       SET(GIT_VERSION "unknown")
+IF(NOT VERSION)
+       SET(VERSION "unknown")
 ENDIF()
 
 ADD_DEFINITIONS(-Os -Wall --std=gnu99 -g3 -Wmissing-declarations
@@ -33,10 +37,13 @@ ADD_DEFINITIONS(-Os -Wall --std=gnu99 -g3 -Wmissing-declarations
        -DOPKGLIBDIR="/usr/lib"
        -DHOST_CPU_STR="${HOST_CPU}"
        -DBUILD_CPU=${BUILD_CPU}
-       -DVERSION="${GIT_VERSION}"
-       -DHAVE_SHA256
+       -DVERSION="${VERSION}"
 )
 
+IF(ENABLE_USIGN)
+       ADD_DEFINITIONS(-DHAVE_USIGN)
+ENDIF()
+
 ADD_SUBDIRECTORY(libbb)
 ADD_SUBDIRECTORY(libopkg)
 ADD_SUBDIRECTORY(src)