Skip to content

Commit db2cf27

Browse files
committed
Fix libdefault installation
1 parent 34c8074 commit db2cf27

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

Makefile.am

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ libdefault_la_LIBADD = libwolfprov.la
2323
# Install libdefault.so to OpenSSL lib directory for replace-default builds
2424
install-exec-hook:
2525
@echo "Installing libdefault.so to OpenSSL lib directory..."
26-
$(INSTALL) -m 755 "$(DESTDIR)$(libdir)/libdefault.so" "$(OPENSSL_LIB_DIR)/libdefault.so"
26+
$(INSTALL) -m 755 "$(DESTDIR)$(libdir)/libdefault.so.0.0.0" "$(OPENSSL_LIB_DIR)/libdefault.so.0"
27+
cd "$(OPENSSL_LIB_DIR)" && ln -sf libdefault.so.0 libdefault.so
2728

2829
uninstall-hook:
2930
@echo "Removing libdefault.so from OpenSSL lib directory..."
30-
rm -f "$(OPENSSL_LIB_DIR)/libdefault.so"
31+
rm -f "$(OPENSSL_LIB_DIR)/libdefault.so" "$(OPENSSL_LIB_DIR)/libdefault.so.0"
3132
endif
3233

3334
EXTRA_DIST+=ChangeLog.md

scripts/env-setup

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ fi
4444
WOLFSSL_LIB_PATH="$REPO_ROOT/wolfssl-install/lib"
4545
WOLFPROV_LIB_PATH="$REPO_ROOT/wolfprov-install/lib"
4646

47-
# Set variables with default values if not already set
48-
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:=$WOLFSSL_LIB_PATH:$OPENSSL_LIB_PATH}"
47+
# Always reconstruct LD_LIBRARY_PATH with correctly detected OPENSSL_LIB_PATH
48+
# (avoids conditional assignment that would skip update if LD_LIBRARY_PATH already set)
49+
export LD_LIBRARY_PATH="$WOLFSSL_LIB_PATH:$OPENSSL_LIB_PATH${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
4950

5051
# Auto-detect FIPS mode and use appropriate config
5152
if [ "${WOLFSSL_ISFIPS:-0}" = "1" ]; then

0 commit comments

Comments
 (0)