Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

boost v1.76.0 #115

Merged
merged 4 commits into from
May 3, 2021
Merged

boost v1.76.0 #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0dab8dd
updated v1.76.0
regro-cf-autotick-bot Apr 30, 2021
002476b
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.10.1, and co…
regro-cf-autotick-bot Apr 30, 2021
42b699a
Update patches
xhochy May 1, 2021
b6a8027
Readd fix-include-dir
xhochy May 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .scripts/run_docker_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 15 additions & 6 deletions .scripts/run_osx_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 24 additions & 3 deletions build-locally.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 0 additions & 25 deletions recipe/456be0b7ecca065fbccf380c2f51e0985e608ba0.patch
View file
Open in desktop

This file was deleted.

24 changes: 24 additions & 0 deletions recipe/5eff1ecc8413b0dc93a1ab047d7fed751e6cb40e.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From 5eff1ecc8413b0dc93a1ab047d7fed751e6cb40e Mon Sep 17 00:00:00 2001
From: Samuel Debionne <[email protected]>
Date: Fri, 30 Apr 2021 11:55:58 +0200
Subject: [PATCH] Add default value for cxx and cxxflags options for the cxx

---
bootstrap.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 654801e21..1c75a39f4 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -226,7 +226,7 @@ rm -f config.log
if test "x$BJAM" = x; then
$ECHO "Building B2 engine.."
pwd=`pwd`
- CXX= CXXFLAGS= "$my_dir/tools/build/src/engine/build.sh" ${TOOLSET}
+ "$my_dir/tools/build/src/engine/build.sh" ${TOOLSET} --cxx="$CXX" --cxxflags="$CXXFLAGS"
if [ $? -ne 0 ]; then
echo
echo "Failed to build B2 build engine"
--
2.20.1
6 changes: 3 additions & 3 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "1.75.0" %}
{% set version = "1.76.0" %}
{% set filename = "boost_%s.tar.bz2" % version.replace(".", "_") %}

package:
Expand All @@ -8,11 +8,11 @@ package:
source:
fn: {{ filename }}
url: https://boostorg.jfrog.io/artifactory/main/release/{{ version }}/source/{{ filename }}
sha256: 953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb
sha256: f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41
patches:
# related to https://github.com/boostorg/build/pull/291
- fix-include-dir.patch # [py3k and py<38]
- 456be0b7ecca065fbccf380c2f51e0985e608ba0.patch # [osx and arm64]
- 5eff1ecc8413b0dc93a1ab047d7fed751e6cb40e.patch

build:
number: 0
Expand Down