From edf8d86d791bec422e50009bc2b039ac0b4e03b7 Mon Sep 17 00:00:00 2001 From: Neal Beeken Date: Mon, 8 Jul 2024 11:55:36 -0400 Subject: [PATCH 1/2] fix(NODE-6253): use runtime linking against system kerberos libraries by default --- binding.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binding.gyp b/binding.gyp index b4ab464..0407d77 100644 --- a/binding.gyp +++ b/binding.gyp @@ -11,7 +11,7 @@ ], 'variables': { 'ARCH': '<(host_arch)', - 'kerberos_use_rtld%': 'false' + 'kerberos_use_rtld%': 'true' }, 'xcode_settings': { 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES', From 1c87111d5c287c41fcac2400ab9d6db38999d221 Mon Sep 17 00:00:00 2001 From: Neal Beeken Date: Mon, 8 Jul 2024 12:38:01 -0400 Subject: [PATCH 2/2] chore: flip more flags --- .evergreen/config.yml | 2 +- .github/scripts/build.mjs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index b5d0ba5..5b3271b 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -124,7 +124,7 @@ tasks: commands: - func: run tests ubuntu vars: - GYP_DEFINES: kerberos_use_rtld=true + GYP_DEFINES: kerberos_use_rtld=false NPM_OPTIONS: --build-from-source - name: run-prebuild commands: diff --git a/.github/scripts/build.mjs b/.github/scripts/build.mjs index 7c5f000..c860202 100644 --- a/.github/scripts/build.mjs +++ b/.github/scripts/build.mjs @@ -19,7 +19,7 @@ async function parseArguments() { const pkg = JSON.parse(await fs.readFile(resolveRoot('package.json'), 'utf8')); const options = { - 'kerberos_use_rtld': { type: 'boolean', default: false }, + 'kerberos_use_rtld': { type: 'boolean', default: true }, help: { short: 'h', type: 'boolean', default: false } }; @@ -66,8 +66,8 @@ async function buildBindings(args, pkg) { // it will also produce `./prebuilds/kerberos-vVERSION-napi-vNAPI_VERSION-OS-ARCH.tar.gz`. let gypDefines = process.env.GYP_DEFINES ?? ''; - if (args.kerberos_use_rtld) { - gypDefines += ' kerberos_use_rtld=true'; + if (!args.kerberos_use_rtld) { + gypDefines += ' kerberos_use_rtld=false'; } gypDefines = gypDefines.trim();