From 14fec0737f9714bfd0175f2e92110f22ef708c91 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Sun, 13 May 2018 21:57:23 +0200 Subject: [PATCH] Patch boost bug --- deal.II-toolchain/packages/boost.package | 8 +++++ .../patches/boost-conflict.patch | 31 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 deal.II-toolchain/patches/boost-conflict.patch diff --git a/deal.II-toolchain/packages/boost.package b/deal.II-toolchain/packages/boost.package index 5f85d88..cd6dfe2 100644 --- a/deal.II-toolchain/packages/boost.package +++ b/deal.II-toolchain/packages/boost.package @@ -20,6 +20,14 @@ package_specific_build () { quit_if_fail "boost build ./b2 failed" } +package_specific_patch () { + if [ "$VERSION" = "1_63_0" ]; then + cd ${UNPACK_PATH}/${EXTRACTSTO} + cecho ${WARN} "applying patch for zlib bzip conflict" + patch -p0 --forward < ${ORIG_DIR}/${PROJECT}/patches/boost-conflict.patch || true + fi +} + package_specific_register () { export BOOST_DIR=${INSTALL_PATH} export BOOST_ROOT=${INSTALL_PATH} diff --git a/deal.II-toolchain/patches/boost-conflict.patch b/deal.II-toolchain/patches/boost-conflict.patch new file mode 100644 index 0000000..f013f42 --- /dev/null +++ b/deal.II-toolchain/patches/boost-conflict.patch @@ -0,0 +1,31 @@ +--- tools/build/src/build/ac.jam 2016-12-22 13:33:21.000000000 +0100 ++++ tools/build/src/build/ac.jam 2018-05-13 14:22:14.492433637 +0200 +@@ -76,14 +76,6 @@ + rule find-library ( properties : names + : provided-path ? ) + { + local result ; +- if ! $(.main.cpp) +- { +- local a = [ class.new action : ac.generate-main : +- [ property-set.empty ] ] ; +- .main.cpp = [ virtual-target.register +- [ class.new file-target main.cpp exact +- : CPP : $(.project) : $(a) ] ] ; +- } + if [ $(properties).get ] = shared + { + link-opts = shared static ; +@@ -100,8 +92,12 @@ + { + local name = $(names-iter[1]) ; + local lib = [ construct-library $(name) : $(properties) : $(provided-path) ] ; ++ local a = [ class.new action : ac.generate-main : ++ [ property-set.empty ] ] ; ++ local main.cpp = [ virtual-target.register ++ [ class.new file-target main-$(name).cpp exact : CPP : $(.project) : $(a) ] ] ; + local test = [ generators.construct $(.project) $(name) : EXE +- : [ $(properties).add $(lib[1]) ] : $(.main.cpp) $(lib[2-]) ++ : [ $(properties).add $(lib[1]) ] : $(main.cpp) $(lib[2-]) + : true ] ; + local jam-targets ; + for t in $(test[2-]) -- 2.39.5