Commit 27121a0c authored by Alessio Netti's avatar Alessio Netti
Browse files

Makefile fixes

- MariaDB connector now compiles correctly on MacOS
- Perfevent DCDBPusher plugin re-added to targets
parent 05cae70f
...@@ -21,3 +21,7 @@ OS = $(shell uname -s) ...@@ -21,3 +21,7 @@ OS = $(shell uname -s)
MAKETHREADS ?= $(if $(findstring $(shell uname),Darwin),$(shell sysctl machdep.cpu.thread_count | cut -b 27-),\ MAKETHREADS ?= $(if $(findstring $(shell uname),Darwin),$(shell sysctl machdep.cpu.thread_count | cut -b 27-),\
$(if $(findstring $(shell uname),Linux),$(shell cat /proc/cpuinfo | grep processor | wc -l),4)) $(if $(findstring $(shell uname),Linux),$(shell cat /proc/cpuinfo | grep processor | wc -l),4))
ifneq ($(OS),Darwin)
PLUGINS += perfevent
endif
...@@ -299,6 +299,8 @@ $(DCDBDEPSPATH)/mariadb-connector-c-$(MARIADBCONNECTOR_VERSION)-src/.built: $(DC ...@@ -299,6 +299,8 @@ $(DCDBDEPSPATH)/mariadb-connector-c-$(MARIADBCONNECTOR_VERSION)-src/.built: $(DC
CC=$(FULL_CC) CXX=$(FULL_CXX) cmake $(CMAKE_CROSS_FLAGS) \ CC=$(FULL_CC) CXX=$(FULL_CXX) cmake $(CMAKE_CROSS_FLAGS) \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$(DCDBDEPLOYPATH)/ \ -DCMAKE_INSTALL_PREFIX=$(DCDBDEPLOYPATH)/ \
-DCMAKE_PREFIX_PATH=$(DCDBDEPSPATH)/openssl-$(OPENSSL_VERSION) \
-DCMAKE_C_FLAGS="-L$(DCDBDEPSPATH)/openssl-$(OPENSSL_VERSION) -lcrypto -lssl" \
$(@D) && \ $(@D) && \
make -j $(MAKETHREADS) && \ make -j $(MAKETHREADS) && \
touch $(@) touch $(@)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment