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

fix(NODE-6320): macos runtime linking name conflict with SSL #193

Merged
merged 2 commits into from
Aug 12, 2024
Merged

fix(NODE-6320): macos runtime linking name conflict with SSL #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae5c6b0
fix(NODE-6320): macos runtime linking name conflict with SSL
nbbeeken Aug 9, 2024
90e71c2
test: check kerberos is importable after building
nbbeeken Aug 9, 2024
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
2 changes: 2 additions & 0 deletions .github/scripts/build.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ async function buildBindings(args, pkg) {
const x64Tar = `kerberos-v${pkg.version}-napi-v4-darwin-x64.tar.gz`;
await fs.copyFile(resolveRoot('prebuilds', armTar), resolveRoot('prebuilds', x64Tar));
}

await run('node', ['--print', `require('.')`], { cwd: resolveRoot() })
}

async function main() {
Expand Down
4 changes: 2 additions & 2 deletions binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
'src/unix/kerberos_unix.cc'
]
}],
['(OS=="mac" or OS=="linux") and (kerberos_use_rtld!="true")', {
['(OS=="mac") or (OS=="linux" and kerberos_use_rtld!="true")', {
'link_settings': {
'libraries': [
'-lkrb5',
Expand All @@ -78,7 +78,7 @@
}]
]
}],
['(OS=="mac" or OS=="linux") and (kerberos_use_rtld=="true")', {
['(OS=="linux") and (kerberos_use_rtld=="true")', {
'defines': ['KERBEROS_USE_RTLD=1'],
'link_settings': {
'libraries': [
Expand Down