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.

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

Various changes for 0.6.16 #111

Merged
merged 12 commits into from
Sep 24, 2024
Next Next commit
slm_builder/conan_lbstanza_generator: 0.6.16 - correct ordering of op…
…enssl libs
  • Loading branch information
jwatson0 committed Sep 23, 2024
commit 14118a3956c5d7286f113f51e8f457b283f6a566
11 changes: 8 additions & 3 deletions slm_builder/conan_lbstanza_generator/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

class LBStanzaGeneratorPyReq(ConanFile):
name = "lbstanzagenerator_pyreq"
version = "0.6.15"
version = "0.6.16"
package_type = "python-require"

# LBStanza Generator class
Expand Down Expand Up @@ -155,6 +155,11 @@ def write_cpp_info_to_fragment(self, is_shared_lib: bool, include_dirs: list[str
libfilenames[tp][os] = []

for pkgname, d in libs.items():
# special case for openssl, order ssl first, then crypto
if pkgname=='openssl' and 'crypto' in d and 'ssl' in d:
# move 'crypto' to the end
d['crypto'] = d.pop('crypto')

for l, p in d.items():
# calculate filenames
if is_shared_lib:
Expand All @@ -165,10 +170,11 @@ def write_cpp_info_to_fragment(self, is_shared_lib: bool, include_dirs: list[str
flnx = f"lib{l}.a"
fmac = f"lib{l}.a"
fwin = f"lib{l}.a"

libfilenames["full"]["linux"].append(Path(p[0]) / flnx)
libfilenames["full"]["macos"].append(Path(p[0]) / fmac)
libfilenames["full"]["windows"].append(Path(p[0]) / fwin)

relative_path = Path(f"{{.}}/../{pkgname}/lib")
libfilenames["relative"]["linux"].append(relative_path / flnx)
libfilenames["relative"]["macos"].append(relative_path / fmac)
Expand Down Expand Up @@ -252,4 +258,3 @@ def generate(self):
self.create_stanza_proj_fragment()

self._conanfile.output.trace("----")