From 538c73ba3f9de965dabfa23d6fb9aaa3ad24b4f5 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Mon, 5 Oct 2015 09:29:40 +0200 Subject: [PATCH] add brew OpenSSL search paths to Darwin configs --- build/config/Darwin-clang | 6 ++++-- build/config/Darwin-clang-libc++ | 11 ++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/build/config/Darwin-clang b/build/config/Darwin-clang index 7990d003f..acfd32c08 100644 --- a/build/config/Darwin-clang +++ b/build/config/Darwin-clang @@ -20,6 +20,8 @@ POCO_TARGET_OSARCH ?= x86_64 POCO_HOST_OSARCH := $(POCO_TARGET_OSARCH) ARCHFLAGS ?= -arch $(POCO_TARGET_OSARCH) +OPENSSL_DIR ?= /usr/local/opt/openssl/ + ifeq ($(POCO_TARGET_OSARCH),i386) RORELOCS = -read_only_relocs suppress endif @@ -72,9 +74,9 @@ RELEASEOPT_LINK = # # System Specific Flags # -SYSFLAGS = -DPOCO_HAVE_IPv6 -DPOCO_NO_STAT64 +SYSFLAGS = -DPOCO_HAVE_IPv6 -DPOCO_NO_STAT64 -I$(OPENSSL_DIR)/include # # System Specific Libraries # -SYSLIBS = -ldl +SYSLIBS = -L$(OPENSSL_DIR)/lib -ldl diff --git a/build/config/Darwin-clang-libc++ b/build/config/Darwin-clang-libc++ index 2f6c15d43..f3e1f793c 100644 --- a/build/config/Darwin-clang-libc++ +++ b/build/config/Darwin-clang-libc++ @@ -20,6 +20,11 @@ POCO_TARGET_OSARCH ?= x86_64 POCO_HOST_OSARCH := $(POCO_TARGET_OSARCH) ARCHFLAGS ?= -arch $(POCO_TARGET_OSARCH) +OPENSSL_DIR ?= /usr/local/opt/openssl/ + +ifeq ($(POCO_TARGET_OSARCH),i386) +RORELOCS = -read_only_relocs suppress +endif # # Tools @@ -30,7 +35,7 @@ LINK = $(CXX) -bind_at_load LIB = libtool -static -o RANLIB = ranlib SHLIB = $(CXX) -dynamiclib -Wl,-install_name,$(POCO_LIB_INSTALLDIR)/$(notdir \$@) -o $@ -DYLIB = $(CXX) -dynamic -bundle -read_only_relocs suppress -Wl,-bind_at_load -o $@ +DYLIB = $(CXX) -dynamic -bundle $(RORELOCS) -Wl,-bind_at_load -o $@ SHLIBLN = $(POCO_BASE)/build/script/shlibln STRIP = DEP = $(POCO_BASE)/build/script/makedepend.clang @@ -69,9 +74,9 @@ RELEASEOPT_LINK = # # System Specific Flags # -SYSFLAGS = -DPOCO_HAVE_IPv6 -DPOCO_NO_STAT64 +SYSFLAGS = -DPOCO_HAVE_IPv6 -DPOCO_NO_STAT64 -I$(OPENSSL_DIR)/include # # System Specific Libraries # -SYSLIBS = -ldl +SYSLIBS = -L$(OPENSSL_DIR)/lib -ldl