summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMyungJoo Ham <myungjoo.ham@samsung.com>2017-09-22 01:16:49 (GMT)
committerMyungJoo Ham <myungjoo.ham@samsung.com>2017-09-22 02:21:50 (GMT)
commite71a2f72566c9edc16c3b9a4a7acb8aa3b5d7309 (patch)
tree18a123a5233eb1b885c95f3b6670e348d678ab7d
parent4cf5243b6381475333152d3f04855526a3e68686 (diff)
downloadcmake-sandbox/mzx/3.5.1.zip
cmake-sandbox/mzx/3.5.1.tar.gz
cmake-sandbox/mzx/3.5.1.tar.bz2
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
-rwxr-xr-xbootstrap4
-rw-r--r--packaging/cmake.spec9
2 files changed, 9 insertions, 4 deletions
diff --git a/bootstrap b/bootstrap
index b3f06a1..66adfec 100755
--- a/bootstrap
+++ b/bootstrap
@@ -634,10 +634,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-zlib|--system-liblzma)
+ --system-bzip2|--system-form|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-zlib|--system-liblzma)
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-zlib|--no-system-liblzma)
+ --no-system-bzip2|--no-system-form|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-zlib|--no-system-liblzma)
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..03180d6 100644
--- a/packaging/cmake.spec
+++ b/packaging/cmake.spec
@@ -1,5 +1,5 @@
Name: cmake
-Version: 2.8.12.2
+Version: 3.5.1
Release: 0
License: BSD-3-Clause
Summary: Cross-platform make system
@@ -13,6 +13,7 @@ BuildRequires: fdupes
BuildRequires: expat-devel
BuildRequires: pkgconfig(libarchive) >= 2.8.0
BuildRequires: pkgconfig(zlib)
+BuildRequires: bzip2-devel
BuildRequires: procps
BuildRequires: ncurses-devel
BuildRequires: gcc-c++
@@ -41,7 +42,11 @@ export CFLAGS="$CXXFLAGS"
--system-libs \
--parallel=0%jobs \
--no-qt-gui \
- --no-system-curl
+ --no-system-curl \
+ --no-system-libarchive \
+ --no-system-liblzma \
+ --no-system-jsoncpp \
+ --no-system-form
%__make VERBOSE=1 %{?_smp_mflags}
%install