Revert "python-six: Removal of python2 & 3 addon versions of six"

[people/pmueller/ipfire-2.x.git] / lfs / boost

diff --git a/lfs/boost b/lfs/boost
index 24cfbdc853ad4bd77d6a850f1c29bbfa76fca400..13559e2502f01733d184d64ce974d34c8e2a2f6e 100644 (file)
--- 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,32 +24,43 @@
 
 include Config
 
-VER        = 1_64_0
+VER        = 1_76_0
 
 THISAPP    = boost_$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = aarch64 x86_64 i586
 
 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-date_time \
+       --without-fiber \
        --without-graph_parallel \
+       --without-mpi \
+       --without-program_options \
        --build-dir=serial \
        variant=release \
        threading=single,multi \
        debug-symbols=off \
        pch=off \
+       link=shared \
        cflags="$(CFLAGS)" \
        cxxflags="$(CXXFLAGS)"
 
-MAKETUNING = -j2
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -58,7 +69,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 319c6ffbbeccc366f14bb68767a6db79
+$(DL_FILE)_MD5 = e425bf1f1d8c36a3cd464884e74f007a
 
 install : $(TARGET)
 
@@ -89,9 +100,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
-       cd $(DIR_APP) && ./bootstrap.sh --with-toolset=gcc
+       cd $(DIR_APP) && ./bootstrap.sh --with-toolset=gcc --with-python=python3
        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)