aboutsummaryrefslogtreecommitdiff
path: root/ports/boost/CONTROL
diff options
context:
space:
mode:
Diffstat (limited to 'ports/boost/CONTROL')
-rw-r--r--ports/boost/CONTROL20
1 files changed, 14 insertions, 6 deletions
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL
index 7001c968a..a5da89a5a 100644
--- a/ports/boost/CONTROL
+++ b/ports/boost/CONTROL
@@ -1,8 +1,16 @@
Source: boost
-<<<<<<< HEAD
-Version: 1.65-2
-=======
-Version: 1.65.1
->>>>>>> master
+Version: 1.65.1-1
Description: Peer-reviewed portable C++ source libraries
-Build-Depends: zlib, bzip2, icu [windows], python3 [windows]
+Build-Depends: zlib, bzip2
+
+Feature: locale-icu
+Description: ICU backend for Boost.Locale
+Build-Depends: icu
+
+Feature: regex-icu
+Description: ICU support for Boost.Regex
+Build-Depends: icu
+
+Feature: python
+Description: a C++ library which enables seamless interoperability between C++ and the Python programming language.
+Build-Depends: python3