File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -261,10 +261,12 @@ ifeq ($(UNAME_S),Darwin)
261261else
262262 cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DCMAKE_POLICY_VERSION_MINIMUM=3.5 .
263263endif
264+ ifneq ($(UNAME_S ) ,Darwin)
264265ifeq ($(PROXYDEBUG ) ,1)
265266 cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_context.h.patch
266267else ifeq ($(USEVALGRIND),1)
267268 cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_context.h.patch
269+ endif
268270endif
269271 cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_stmt.c.patch
270272 cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_lib.c.patch
@@ -420,7 +422,7 @@ endif
420422libusual : libusual/libusual/.libs/libusual.a
421423
422424
423- libscram/lib/libscram.a :postgresql/postgresql/src/interfaces/libpq/libpq.a
425+ libscram/lib/libscram.a :postgresql/postgresql/src/interfaces/libpq/libpq.a
424426 cd libscram && rm -rf lib/* || true
425427 cd libscram && CC=${CC} CXX=${CXX} ${MAKE} LIBOPENSSL_DIR=" $( SSL_IDIR) " POSTGRESQL_DIR=" $( shell pwd) /postgresql/postgresql/"
426428
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ Ensure you have [Homebrew](https://brew.sh/) installed.
1111Run the following command to install the required build tools and libraries:
1212
1313``` bash
14- brew install automake bzip2 cmake make git gpatch gnutls openssl@3 icu4c pkg-config libiconv zlib
14+ brew install automake bzip2 cmake make git gpatch gnutls openssl@3 icu4c pkg-config libiconv libtool zlib
1515```
1616
1717## Compilation Steps
Original file line number Diff line number Diff line change 9797
9898MYCXXFLAGS := $(STDCPP )
9999ifeq ($(CXX ) ,clang++)
100+ ifneq ($(UNAME_S ) ,Darwin)
100101 MYCXXFLAGS += -fuse-ld=lld
101102endif
103+ endif
102104MYCXXFLAGS += $(IDIRS ) $(OPTZ ) $(DEBUG ) $(PSQLCH ) $(PSQL40 ) $(PSQL31 ) $(PSQLFFTO ) $(PSQLTSDB ) -DGITVERSION=\"$(GIT_VERSION ) \" $(NOJEM ) $(WGCOV ) $(WASAN )
103105
104106
You can’t perform that action at this time.
0 commit comments