From 20cb1149df35159430654462a59dde20f14e0f77 Mon Sep 17 00:00:00 2001 From: Rahim Kanji Date: Sun, 16 Jun 2024 21:59:13 +0500 Subject: [PATCH] Fixed OpenSSL includes and linking --- deps/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deps/Makefile b/deps/Makefile index a45694368..4e3cd7a9e 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -304,7 +304,7 @@ postgresql/postgresql/src/interfaces/libpq/libpq.a : libssl/openssl/libssl.a cd postgresql && rm -rf postgresql-*/ || true cd postgresql && tar -zxf postgresql-*.tar.gz cd postgresql/postgresql && patch -p0 < ../get_result_from_pgconn.patch - cd postgresql/postgresql && ./configure --with-ssl=openssl --with-includes=$(shell pwd)/libssl/openssl/include/openssl --with-libraries=$(shell pwd)/libssl/openssl/lib --enable-static --without-readline + cd postgresql/postgresql && LD_LIBRARY_PATH="$(shell pwd)/libssl/openssl" ./configure --with-ssl=openssl --with-includes="$(shell pwd)/libssl/openssl/include" --with-libraries="$(shell pwd)/libssl/openssl/lib" --without-readline cd postgresql/postgresql/src/interfaces/libpq && CC=${CC} CXX=${CXX} ${MAKE} MAKELEVEL=0 #cd postgresql/postgresql && CC=${CC} CXX=${CXX} ${MAKE} -f src/interfaces/libpq/Makefile all @@ -314,14 +314,14 @@ libusual/libusual/.libs/libusual.a: libssl/openssl/libssl.a cd libusual && rm -rf libusual-*/ || true cd libusual && tar -zxf libusual-*.tar.gz cd libusual/libusual && ./autogen.sh - cd libusual/libusual && ./configure --with-openssl=$(shell pwd)/libssl/openssl/ --disable-shared + cd libusual/libusual && ./configure --with-openssl="$(shell pwd)/libssl/openssl" --disable-shared cd libusual/libusual && CC=${CC} CXX=${CXX} ${MAKE} libusual: libusual/libusual/.libs/libusual.a libscram/lib/libscram.a: libssl/openssl/libssl.a postgresql/postgresql/src/interfaces/libpq/libpq.a cd libscram && rm -rf lib/* || true - cd libscram && CC=${CC} CXX=${CXX} ${MAKE} LIBOPENSSL_DIR=$(shell pwd)/libssl/openssl/ POSTGRESQL_DIR=$(shell pwd)/postgresql/postgresql + cd libscram && CC=${CC} CXX=${CXX} ${MAKE} LIBOPENSSL_DIR="$(shell pwd)/libssl/openssl" POSTGRESQL_DIR="$(shell pwd)/postgresql/postgresql" libscram: libscram/lib/libscram.a