From 5667f3f94a063482e9656513046100a08e978882 Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Mon, 9 Jan 2017 13:10:01 +0100 Subject: [PATCH] build script changes for boost --- nix/build-all.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nix/build-all.py b/nix/build-all.py index 61e70e340c..b8413d1224 100644 --- a/nix/build-all.py +++ b/nix/build-all.py @@ -338,7 +338,7 @@ def build_dependency(name, mode, build_tool_args, download_url, download_name, d logger.info("\rBuilding %s... " % (name,)) __check_call__(["./b2", "-j%s" % (IFCOS_NUM_BUILD_PROCS,)]+build_tool_args, cwd=extract_dir) logger.info("\rInstalling %s... " % (name,)) - shutil.copy(os.path.join(extract_dir, "boost"), os.path.join(DEPS_DIR, "install", "boost-%s" % (BOOST_VERSION,))) + shutil.copytree(os.path.join(extract_dir, "boost"), os.path.join(DEPS_DIR, "install", "boost-%s" % BOOST_VERSION, "boost")) logger.info("\rInstalled %s \n" % (name,)) cecho("Collecting dependencies:", GREEN) @@ -443,7 +443,8 @@ for PYTHON_VERSION in PYTHON_VERSIONS: os.environ["CXXFLAGS"]=OLD_CXX_FLAGS os.environ["CFLAGS"]=OLD_C_FLAGS -build_dependency("boost-%s" % (BOOST_VERSION,), mode="bjam", build_tool_args=["--stagedir=%s/install/boost-%s" % (DEPS_DIR, BOOST_VERSION), "--with-system", "--with-program_options", "--with-regex", "--with-thread", "--with-date_time", "link=static"]+BOOST_ADDRESS_MODEL+["cxxflags=\"%s\"" % (CXXFLAGS,), "linkflags=\"%s\"" % (LDFLAGS,), "stage"], download_url="http://downloads.sourceforge.net/project/boost/boost/%s/" % (BOOST_VERSION,), download_name="boost_%s.tar.bz2" % (BOOST_VERSION_UNDERSCORE,)) +str_concat = lambda prefix: lambda postfix: "=".join((prefix, postfix.strip())) +build_dependency("boost-%s" % (BOOST_VERSION,), mode="bjam", build_tool_args=["--stagedir=%s/install/boost-%s" % (DEPS_DIR, BOOST_VERSION), "--with-system", "--with-program_options", "--with-regex", "--with-thread", "--with-date_time", "link=static"]+BOOST_ADDRESS_MODEL+list(map(str_concat("cxxflags"), CXXFLAGS.strip().split(' '))) + list(map(str_concat("linkflags"), LDFLAGS.strip().split(' '))) + ["stage"], download_url="http://downloads.sourceforge.net/project/boost/boost/%s/" % (BOOST_VERSION,), download_name="boost_%s.tar.bz2" % (BOOST_VERSION_UNDERSCORE,)) build_dependency(name="icu-%s" % (ICU_VERSION,), mode="icu", build_tool_args=["--enable-static", "--disable-shared"], download_url="http://download.icu-project.org/files/icu4c/%s/" % (ICU_VERSION,), download_name="icu4c-%s-src.tgz" % (ICU_VERSION_UNDERSCORE,))