ss_bsdiff: Enable libdivsufsort by default

This fixes the issue where containers would build ss_bsdiff without
libdivsufsort.

Change-Id: I3f91566e24517899ff2a07adae51fee9a1fb600e

diff --git a/bsdiff/CMakeLists.txt b/bsdiff/CMakeLists.txt
index 0aa8b5d040d4fa85c259f95f44f243262b20c6e1..e769df64ad29f22a44eea2097729a97ef2e21ef0 100644 (file)
--- a/bsdiff/CMakeLists.txt
+++ b/bsdiff/CMakeLists.txt
@@ -5,15 +5,15 @@ SET(ss_bsdiff_SRCS ss_bsdiff.c)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/bsdiff)
 
-if (${ENABLE_LIBDIVSUFSORT})
-       ADD_DEFINITIONS("-DENABLE_LIBDIVSUFSORT=1")
+if (${DISABLE_LIBDIVSUFSORT})
+       ADD_DEFINITIONS("-DDISABLE_LIBDIVSUFSORT=1")
        SET(PKG_MODULES
-               libdivsufsort
                libbrotlienc
        )
 else()
-       ADD_DEFINITIONS("-DENABLE_LIBDIVSUFSORT=0")
+       ADD_DEFINITIONS("-DDISABLE_LIBDIVSUFSORT=0")
        SET(PKG_MODULES
+               libdivsufsort
                libbrotlienc
        )
 endif()

diff --git a/bsdiff/ss_bsdiff.c b/bsdiff/ss_bsdiff.c
index 6a6422a9e9e019fc400db29087a175a637805d8b..7a6245e45c57ea1e0c41c6b0a6d79e23583a5597 100644 (file)
--- a/bsdiff/ss_bsdiff.c
+++ b/bsdiff/ss_bsdiff.c
@@ -86,15 +86,15 @@ void get_time_stamp(void)
  * Since the TV profile does not support libdivsufsort package, it is required
  * to not use libdivsufsort if build profile is TV.
  * Thus, dummy codes for libdivsufsort is added to use when the profile is TV.
- * ENABLE_LIBDIVSUFSORT is 0 if it is TV profile,
- * else ENABLE_LIBDIVSUFSORT is 1.
+ * DISABLE_LIBDIVSUFSORT is 1 if it is TV profile,
+ * else DISABLE_LIBDIVSUFSORT is 0.
  */
-#if ENABLE_LIBDIVSUFSORT == 1
+#if DISABLE_LIBDIVSUFSORT == 0
 
 //supporting only 32 bit divsufsort for now.
 #include <divsufsort.h>
 
-#elif ENABLE_LIBDIVSUFSORT == 0
+#elif DISABLE_LIBDIVSUFSORT == 1
 
 #include <stdint.h>
 

diff --git a/packaging/upgrade-tools.spec b/packaging/upgrade-tools.spec
index 426b8a4421917ccbed176947177de450cdde9cad..27fc73a8718bb834391537e6b6d55f0eab63c1af 100644 (file)
--- a/packaging/upgrade-tools.spec
+++ b/packaging/upgrade-tools.spec
@@ -24,9 +24,9 @@ Tools for upgrade
 %cmake . \
        -DINSTALL_PATH=%{bin_install_path} \
 %if "%{tizen_profile_name}" == "tv"
-       -DENABLE_LIBDIVSUFSORT=0
+       -DDISABLE_LIBDIVSUFSORT=1
 %else
-       -DENABLE_LIBDIVSUFSORT=1
+       -DDISABLE_LIBDIVSUFSORT=0
 %endif
 
 %build