X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fboost;h=50a3a46746cb0fb157f030a46c1b11e165129fa5;hp=b9b501582632ad669814ed5a8e6092049356468c;hb=8288c0394bb96f5aa3878ea86c05c2d92d677347;hpb=e2d4f687dcd1e5e240f278d5c99d27fe75cd76bf

diff --git a/lfs/boost b/lfs/boost
index b9b5015826..50a3a46746 100644
--- a/lfs/boost
+++ b/lfs/boost
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-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        = 1_55_0
+VER        = 1_64_0
 
 THISAPP    = boost_$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,25 +32,33 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-CFLAGS    += -fno-strict-aliasing
-CXXFLAGS  += -fno-strict-aliasing
+CFLAGS    += -O3 -fno-strict-aliasing
+CXXFLAGS  += -O3 -fno-strict-aliasing
+
+# The compiler uses a lot of memory to compile boost, hence we reduce
+# the total number of processes a little bit to be able to build on
+# smaller machines
+MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 512)))
 
 CONFIGURE_OPTIONS = \
 	--prefix=/usr \
 	--layout=tagged \
-	--without-mpi \
+	--without-chrono \
+	--without-context \
+	--without-coroutine \
+	--without-coroutine2 \
+	--without-date_time \
+	--without-fiber \
 	--without-graph_parallel \
+	--without-mpi \
+	--without-program_options \
 	--build-dir=serial \
-	cflags="$(CFLAGS)" \
-	cxxflags="$(CXXFLAGS)" \
 	variant=release \
 	threading=single,multi \
 	debug-symbols=off \
-	pch=off
-
-ifeq "$(MACHINE)" "armv5tel"
-	MAKETUNING = -j2
-endif
+	pch=off \
+	cflags="$(CFLAGS)" \
+	cxxflags="$(CXXFLAGS)"
 
 ###############################################################################
 # Top-level Rules
@@ -60,7 +68,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 93780777cfbf999a600f62883bd54b17
+$(DL_FILE)_MD5 = 319c6ffbbeccc366f14bb68767a6db79
 
 install : $(TARGET)
 
@@ -93,7 +101,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	cd $(DIR_APP) && ./bootstrap.sh --with-toolset=gcc
 	cd $(DIR_APP) && ./b2 -d+2 -q $(MAKETUNING) $(CONFIGURE_OPTIONS) stage
-	cd $(DIR_APP) && ./b2 $(MAKETUNING) $(CONFIGURE_OPTIONS) install
+	cd $(DIR_APP) && ./b2 $(CONFIGURE_OPTIONS) install
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)