Skip to content

Commit bfd659a

Browse files
committed
Conan: Updates to fix sudden linkage issues
We suddenly started to have some linking issues in the 0.27 branch after the libcurl packages were updated in the conan-center repositories. After some experimentation I took the following steps to fix up the situation: - Update conan to latest version - Update of libcurl to the latest version available - Use libcurl static libraries Note that the change to use static libraries is just to make the deployment step as easier as possible in the travis builds.
1 parent c4bfd0f commit bfd659a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ before_build:
5858
- cmd: cd envs
5959
- cmd: python -m virtualenv conan
6060
- cmd: conan/Scripts/activate
61-
- cmd: python -m pip install conan==1.11.2
61+
- cmd: python -m pip install conan==1.11.2 # TODO: Update to latest version (needs python 3)
6262
- cmd: cd ..
6363
- cmd: conan --version
6464
- cmd: conan remote add conan-bincrafters https://api.bintray.com/conan/bincrafters/public-conan

ci/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ else
2222
fi
2323

2424
python --version
25-
pip install conan==1.11.2
25+
pip install conan==1.17.0
2626
pip install codecov
2727
conan --version
2828
conan config set storage.path=~/conanData

conanfile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Exiv2Conan(ConanFile):
1717
)
1818

1919
def configure(self):
20-
self.options['libcurl'].shared = True
20+
self.options['libcurl'].shared = False
2121
self.options['libcurl'].with_openssl = True
2222
self.options['gtest'].shared = True
2323

@@ -34,7 +34,7 @@ def requirements(self):
3434
self.requires('gtest/1.8.1@bincrafters/stable')
3535

3636
if self.options.webready and not os_info.is_macos:
37-
self.requires('libcurl/7.61.1@bincrafters/stable')
37+
self.requires('libcurl/7.64.1@bincrafters/stable')
3838

3939
if self.options.xmp:
4040
self.requires('XmpSdk/2016.7@piponazo/stable') # from conan-piponazo

0 commit comments

Comments
 (0)