X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcmake;h=dd0f626a9d69f8031d40e5213e77171708f3c85b;hb=351567966d83908eb3de7108f79c4eab7a37e1e0;hp=e3d211910cb9b999017f544245d7a42add480f2b;hpb=8a1a3bf3934c8a92c605135ee13db466ea3dcbf4;p=ipfire-2.x.git

diff --git a/lfs/cmake b/lfs/cmake
index e3d211910c..dd0f626a9d 100644
--- a/lfs/cmake
+++ b/lfs/cmake
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2015  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2018  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.2.3
+VER        = 3.11.2
 
 THISAPP    = cmake-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,9 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-ifeq "$(MACHINE)" "armv5tel"
-	MAKETUNING = -j2
-endif
+MAKETUNING = -j2
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d51c92bf66b1e9d4fe2b7aaedd51377c
+$(DL_FILE)_MD5 = d2d554c05fc07cfae7846d2aa205f12a
 
 install : $(TARGET)
 
@@ -73,16 +71,18 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && sed -i '/CMAKE_USE_LIBUV 1/s/1/0/' CMakeLists.txt
+	cd $(DIR_APP) && sed -i '/"lib64"/s/64//' Modules/GNUInstallDirs.cmake
 	cd $(DIR_APP) && ./bootstrap \
 			--prefix=/usr \
 			--system-libs \
 			--mandir=/share/man \
 			--no-system-jsoncpp \
-			--docdir=/share/doc/cmake-2.8.12.2
-
+			--no-system-librhash \
+			--no-system-libuv \
+			--docdir=/share/doc/cmake
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)