summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMyungJoo Ham <myungjoo.ham@samsung.com>2017-10-11 06:23:01 (GMT)
committerSoonKyu Park <sk7.park@samsung.com>2018-04-03 02:29:25 (GMT)
commite67a4548b8e5ab091400b9b6134f2606c56c5b51 (patch)
treec49e794a75eb7b0462deb808e5cf21e96ae033be
parent0146bdbef71121a8ac61c75fead9de42049ff9a2 (diff)
downloadcmake-e67a4548b8e5ab091400b9b6134f2606c56c5b51.zip
cmake-e67a4548b8e5ab091400b9b6134f2606c56c5b51.tar.gz
cmake-e67a4548b8e5ab091400b9b6134f2606c56c5b51.tar.bz2
- Remove dependency on rhash, json-cpp, libuv, form Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
-rwxr-xr-xbootstrap4
-rw-r--r--packaging/cmake.spec8
2 files changed, 8 insertions, 4 deletions
diff --git a/bootstrap b/bootstrap
index 7674130..b5effd6 100755
--- a/bootstrap
+++ b/bootstrap
@@ -740,10 +740,10 @@ while test $# != 0; do
--init=*) cmake_init_file=`cmake_arg "$1"` ;;
--system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=1" ;;
--no-system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=0" ;;
- --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma)
+ --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma|--system-libuv|--system-form)
lib=`cmake_arg "$1" "--system-"`
cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=1" ;;
- --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma)
+ --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma|--no-system-libuv|--no-system-form)
lib=`cmake_arg "$1" "--no-system-"`
cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=0" ;;
--qt-gui) cmake_bootstrap_qt_gui="1" ;;
diff --git a/packaging/cmake.spec b/packaging/cmake.spec
index 9d63dd5..13b0c0a 100644
--- a/packaging/cmake.spec
+++ b/packaging/cmake.spec
@@ -1,5 +1,5 @@
Name: cmake
-Version: 2.8.12.2
+Version: 3.9.4
Release: 0
License: BSD-3-Clause
Summary: Cross-platform make system
@@ -41,7 +41,11 @@ export CFLAGS="$CXXFLAGS"
--system-libs \
--parallel=0%jobs \
--no-qt-gui \
- --no-system-curl
+ --no-system-curl \
+ --no-system-jsoncpp \
+ --no-system-librhash \
+ --no-system-libuv \
+ --no-system-form
%__make VERBOSE=1 %{?_smp_mflags}
%install