add brew OpenSSL search paths to Darwin configs

This commit is contained in:
Guenter Obiltschnig 2015-10-05 09:29:40 +02:00
parent df060cecbf
commit 538c73ba3f
2 changed files with 12 additions and 5 deletions

View File

@ -20,6 +20,8 @@ POCO_TARGET_OSARCH ?= x86_64
POCO_HOST_OSARCH := $(POCO_TARGET_OSARCH) POCO_HOST_OSARCH := $(POCO_TARGET_OSARCH)
ARCHFLAGS ?= -arch $(POCO_TARGET_OSARCH) ARCHFLAGS ?= -arch $(POCO_TARGET_OSARCH)
OPENSSL_DIR ?= /usr/local/opt/openssl/
ifeq ($(POCO_TARGET_OSARCH),i386) ifeq ($(POCO_TARGET_OSARCH),i386)
RORELOCS = -read_only_relocs suppress RORELOCS = -read_only_relocs suppress
endif endif
@ -72,9 +74,9 @@ RELEASEOPT_LINK =
# #
# System Specific Flags # System Specific Flags
# #
SYSFLAGS = -DPOCO_HAVE_IPv6 -DPOCO_NO_STAT64 SYSFLAGS = -DPOCO_HAVE_IPv6 -DPOCO_NO_STAT64 -I$(OPENSSL_DIR)/include
# #
# System Specific Libraries # System Specific Libraries
# #
SYSLIBS = -ldl SYSLIBS = -L$(OPENSSL_DIR)/lib -ldl

View File

@ -20,6 +20,11 @@ POCO_TARGET_OSARCH ?= x86_64
POCO_HOST_OSARCH := $(POCO_TARGET_OSARCH) POCO_HOST_OSARCH := $(POCO_TARGET_OSARCH)
ARCHFLAGS ?= -arch $(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 # Tools
@ -30,7 +35,7 @@ LINK = $(CXX) -bind_at_load
LIB = libtool -static -o LIB = libtool -static -o
RANLIB = ranlib RANLIB = ranlib
SHLIB = $(CXX) -dynamiclib -Wl,-install_name,$(POCO_LIB_INSTALLDIR)/$(notdir \$@) -o $@ 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 SHLIBLN = $(POCO_BASE)/build/script/shlibln
STRIP = STRIP =
DEP = $(POCO_BASE)/build/script/makedepend.clang DEP = $(POCO_BASE)/build/script/makedepend.clang
@ -69,9 +74,9 @@ RELEASEOPT_LINK =
# #
# System Specific Flags # System Specific Flags
# #
SYSFLAGS = -DPOCO_HAVE_IPv6 -DPOCO_NO_STAT64 SYSFLAGS = -DPOCO_HAVE_IPv6 -DPOCO_NO_STAT64 -I$(OPENSSL_DIR)/include
# #
# System Specific Libraries # System Specific Libraries
# #
SYSLIBS = -ldl SYSLIBS = -L$(OPENSSL_DIR)/lib -ldl