Skip to content

Commit

Permalink
boost: build only MSVC with nowide
Browse files Browse the repository at this point in the history
  • Loading branch information
madebr committed Dec 22, 2020
1 parent 3ec9036 commit ca43764
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 80 deletions.
142 changes: 71 additions & 71 deletions recipes/boost/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
sources:
1.69.0:
url: [
"https://dl.bintray.com/boostorg/release/1.69.0/source/boost_1_69_0.tar.bz2",
"https://sourceforge.net/projects/boost/files/boost/1.69.0/boost_1_69_0.tar.bz2",
]
sha256: "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"
1.70.0:
url: [
"https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2",
"https://sourceforge.net/projects/boost/files/boost/1.70.0/boost_1_70_0.tar.bz2",
]
sha256: "430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778"
1.71.0:
url: [
"https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2",
]
sha256: "d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee"
1.72.0:
url: [
"https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2",
"https://sourceforge.net/projects/boost/files/boost/1.72.0/boost_1_72_0.tar.bz2",
]
sha256: "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722"
# 1.69.0:
# url: [
# "https://dl.bintray.com/boostorg/release/1.69.0/source/boost_1_69_0.tar.bz2",
# "https://sourceforge.net/projects/boost/files/boost/1.69.0/boost_1_69_0.tar.bz2",
# ]
# sha256: "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"
# 1.70.0:
# url: [
# "https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2",
# "https://sourceforge.net/projects/boost/files/boost/1.70.0/boost_1_70_0.tar.bz2",
# ]
# sha256: "430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778"
# 1.71.0:
# url: [
# "https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2",
# ]
# sha256: "d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee"
# 1.72.0:
# url: [
# "https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2",
# "https://sourceforge.net/projects/boost/files/boost/1.72.0/boost_1_72_0.tar.bz2",
# ]
# sha256: "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722"
1.73.0:
url: [
"https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2",
Expand All @@ -41,54 +41,54 @@ sources:
]
sha256: "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb"
patches:
1.69.0:
- patch_file: "patches/boost_build_asmflags.patch"
base_path: "source_subfolder"
- patch_file: "patches/python_base_prefix.patch"
base_path: "source_subfolder"
- patch_file: "patches/static_object_init.patch"
base_path: "source_subfolder"
- patch_file: "patches/support_msvc_2019.patch"
base_path: "source_subfolder"
1.70.0:
- patch_file: "patches/0001-beast-fix-moved-from-executor.patch"
base_path: "source_subfolder"
- patch_file: "patches/bcp_namespace_issues_1_70.patch"
base_path: "source_subfolder"
- patch_file: "patches/boost_build_qcc_fix_debug_build_parameter.patch"
base_path: "source_subfolder"
- patch_file: "patches/boost_core_qnx_cxx_provide___cxa_get_globals.patch"
base_path: "source_subfolder"
- patch_file: "patches/python_base_prefix.patch"
base_path: "source_subfolder"
- patch_file: "patches/solaris_pthread_data.patch"
base_path: "source_subfolder"
1.71.0:
- patch_file: "patches/bcp_namespace_issues_1_71.patch"
base_path: "source_subfolder"
- patch_file: "patches/boost_build_qcc_fix_debug_build_parameter.patch"
base_path: "source_subfolder"
- patch_file: "patches/boost_core_qnx_cxx_provide___cxa_get_globals.patch"
base_path: "source_subfolder"
- patch_file: "patches/python_base_prefix.patch"
base_path: "source_subfolder"
- patch_file: "patches/solaris_pthread_data.patch"
base_path: "source_subfolder"
1.72.0:
- patch_file: "patches/bcp_namespace_issues_1_72.patch"
base_path: "source_subfolder"
- patch_file: "patches/boost_build_qcc_fix_debug_build_parameter.patch"
base_path: "source_subfolder"
- patch_file: "patches/boost_core_qnx_cxx_provide___cxa_get_globals.patch"
base_path: "source_subfolder"
- patch_file: "patches/python_base_prefix.patch"
base_path: "source_subfolder"
- patch_file: "patches/solaris_pthread_data.patch"
base_path: "source_subfolder"
- patch_file: "patches/0001-revert-cease-dependence-on-range.patch"
base_path: "source_subfolder"
- patch_file: "patches/boost_log_filesystem_no_deprecated_1_72.patch"
base_path: "source_subfolder"
# 1.69.0:
# - patch_file: "patches/boost_build_asmflags.patch"
# base_path: "source_subfolder"
# - patch_file: "patches/python_base_prefix.patch"
# base_path: "source_subfolder"
# - patch_file: "patches/static_object_init.patch"
# base_path: "source_subfolder"
# - patch_file: "patches/support_msvc_2019.patch"
# base_path: "source_subfolder"
# 1.70.0:
# - patch_file: "patches/0001-beast-fix-moved-from-executor.patch"
# base_path: "source_subfolder"
# - patch_file: "patches/bcp_namespace_issues_1_70.patch"
# base_path: "source_subfolder"
# - patch_file: "patches/boost_build_qcc_fix_debug_build_parameter.patch"
# base_path: "source_subfolder"
# - patch_file: "patches/boost_core_qnx_cxx_provide___cxa_get_globals.patch"
# base_path: "source_subfolder"
# - patch_file: "patches/python_base_prefix.patch"
# base_path: "source_subfolder"
# - patch_file: "patches/solaris_pthread_data.patch"
# base_path: "source_subfolder"
# 1.71.0:
# - patch_file: "patches/bcp_namespace_issues_1_71.patch"
# base_path: "source_subfolder"
# - patch_file: "patches/boost_build_qcc_fix_debug_build_parameter.patch"
# base_path: "source_subfolder"
# - patch_file: "patches/boost_core_qnx_cxx_provide___cxa_get_globals.patch"
# base_path: "source_subfolder"
# - patch_file: "patches/python_base_prefix.patch"
# base_path: "source_subfolder"
# - patch_file: "patches/solaris_pthread_data.patch"
# base_path: "source_subfolder"
# 1.72.0:
# - patch_file: "patches/bcp_namespace_issues_1_72.patch"
# base_path: "source_subfolder"
# - patch_file: "patches/boost_build_qcc_fix_debug_build_parameter.patch"
# base_path: "source_subfolder"
# - patch_file: "patches/boost_core_qnx_cxx_provide___cxa_get_globals.patch"
# base_path: "source_subfolder"
# - patch_file: "patches/python_base_prefix.patch"
# base_path: "source_subfolder"
# - patch_file: "patches/solaris_pthread_data.patch"
# base_path: "source_subfolder"
# - patch_file: "patches/0001-revert-cease-dependence-on-range.patch"
# base_path: "source_subfolder"
# - patch_file: "patches/boost_log_filesystem_no_deprecated_1_72.patch"
# base_path: "source_subfolder"
1.73.0:
- patch_file: "patches/boost_build_qcc_fix_debug_build_parameter.patch"
base_path: "source_subfolder"
Expand Down
3 changes: 2 additions & 1 deletion recipes/boost/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ class BoostConan(ConanFile):

_options = None


options = {
"shared": [True, False],
"header_only": [True, False],
Expand Down Expand Up @@ -239,6 +238,8 @@ def _configure_options(self):
return self._dependencies["configure_options"]

def configure(self):
if self.settings.compiler != "Visual Studio":
raise ConanInvalidConfiguration("I build only MSVC")
if self.options.without_locale:
self.options.i18n_backend = None
else:
Expand Down
16 changes: 8 additions & 8 deletions recipes/boost/config.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
versions:
1.69.0:
folder: all
1.70.0:
folder: all
1.71.0:
folder: all
1.72.0:
folder: all
# 1.69.0:
# folder: all
# 1.70.0:
# folder: all
# 1.71.0:
# folder: all
# 1.72.0:
# folder: all
1.73.0:
folder: all
1.74.0:
Expand Down

0 comments on commit ca43764

Please sign in to comment.