Commit a600167c authored by Michael Ott's avatar Michael Ott
Browse files

Don't build OpenSSL from source anymore

parent 7cb437aa
......@@ -2,7 +2,6 @@ SOURCEFORGE_MROR = deac-fra
CASSANDRA_VERSION = 3.11.5
MOSQUITTO_VERSION = 1.5.5
BOOST_VERSION = 1.70.0
OPENSSL_VERSION = 1.1.1c
CPPDRV_VERSION = 2.16.2-1
LIBUV_VERSION = 1.44.0
BACNET-STACK_VERSION = 0.8.6
......@@ -24,7 +23,6 @@ OPASTACK_VERSION_H = $(subst .4,-4,$(OPASTACK_VERSION))
DISTFILES = apache-cassandra-$(CASSANDRA_VERSION).tar.gz;http://archive.apache.org/dist/cassandra/$(CASSANDRA_VERSION)/apache-cassandra-$(CASSANDRA_VERSION)-bin.tar.gz \
mosquitto-$(MOSQUITTO_VERSION).tar.gz;http://mosquitto.org/files/source/mosquitto-$(MOSQUITTO_VERSION).tar.gz \
boost_$(BOOST_VERSION_U).tar.gz;http://$(SOURCEFORGE_MROR).dl.sourceforge.net/project/boost/boost/$(BOOST_VERSION)/boost_$(BOOST_VERSION_U).tar.gz \
openssl-$(OPENSSL_VERSION).tar.gz;https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz \
libuv-v$(LIBUV_VERSION).tar.gz;https://dist.libuv.org/dist/v$(LIBUV_VERSION)/libuv-v$(LIBUV_VERSION).tar.gz \
cpp-driver-$(CPPDRV_VERSION).tar.gz;https://github.com/scylladb/cpp-driver/archive/refs/tags/$(CPPDRV_VERSION).tar.gz\
bacnet-stack-$(BACNET-STACK_VERSION).tgz;https://downloads.sourceforge.net/project/bacnet/bacnet-stack/bacnet-stack-$(BACNET-STACK_VERSION)/bacnet-stack-$(BACNET-STACK_VERSION).tgz \
......@@ -42,7 +40,6 @@ DISTFILES = apache-cassandra-$(CASSANDRA_VERSION).tar.gz;http://archive.apache.o
DISTFILES_HASHES = apache-cassandra-3.11.5.tar.gz|9428d8cd8bf8880d6536142e4b837412;\
mosquitto-1.5.5.tar.gz|a17dffc6f63b2a4ab2eb5c51139e60e9;\
boost_1_70_0.tar.gz|fea771fe8176828fabf9c09242ee8c26;\
openssl-1.1.1c.tar.gz|15e21da6efe8aa0e0768ffd8cd37a5f6;\
cpp-driver-2.16.2-1.tar.gz|1cd6e5a75f0d817aa56a30d38bbff3d2;\
libuv-v1.44.0.tar.gz|aa93146a44ff323e52dc598c85b8ba0c;\
bacnet-stack-0.8.6.tgz|544ebd42ed959deb2213209b66bbc460;\
......@@ -73,7 +70,7 @@ FETCH = wget -c --no-check-certificate -O
MD5 = $(if $(shell which md5 2>/dev/null),md5,$(if $(shell md5sum --tag Makefile 2&> /dev/null || true),md5sum --tag,openssl md5))
DISTFILESNAMES = $(foreach f,$(DISTFILES),$(shell echo "$(f)" | sed 's/;.*//'))
DISTFILESPATHS_FULL = $(foreach f,$(DISTFILES),$(shell echo "$(f)" | sed 's/.tar.gz;.*//; s/.tgz;.*//; s/.zip;.*//; s/.7z;.*//' ))
DISTFILESPATHS ?= apache-cassandra-$(CASSANDRA_VERSION) mosquitto-$(MOSQUITTO_VERSION) boost_$(BOOST_VERSION_U) openssl-$(OPENSSL_VERSION) libuv-v$(LIBUV_VERSION) cpp-driver-$(CPPDRV_VERSION)
DISTFILESPATHS ?= apache-cassandra-$(CASSANDRA_VERSION) mosquitto-$(MOSQUITTO_VERSION) boost_$(BOOST_VERSION_U) libuv-v$(LIBUV_VERSION) cpp-driver-$(CPPDRV_VERSION)
define plugins2deps
ifneq (,$(findstring bacnet,$(PLUGINS)))
......@@ -100,10 +97,8 @@ endif
endef
ifeq ("$(OS)", "Darwin")
OPENSSL_TARGET = "darwin64-x86_64-cc"
SNAP7_OS_FAMILY = osx
else
OPENSSL_TARGET = $(shell echo $(OS) | tr A-Z a-z)-$(ARCH)
SNAP7_OS_FAMILY = unix
endif
......@@ -172,15 +167,6 @@ $(DCDBDEPSPATH)/%/.patched: $(DCDBDEPSPATH)/%/.extracted
fi
@touch $@
$(DCDBDEPSPATH)/openssl-$(OPENSSL_VERSION)/.built: $(DCDBDEPSPATH)/openssl-$(OPENSSL_VERSION)/.patched
@echo "Building OpenSSL library..."
cd $(@D) && ./Configure shared --prefix=$(DCDBDEPLOYPATH) $(OPENSSL_TARGET)
cd $(@D) && make && touch $(@)
$(DCDBDEPSPATH)/openssl-$(OPENSSL_VERSION)/.installed: $(DCDBDEPSPATH)/openssl-$(OPENSSL_VERSION)/.built | $(DCDBDEPLOYPATH)
@echo "Installing OpenSSL library..."
cd $(@D) && make install_sw && touch $(@)
$(DCDBDEPSPATH)/mosquitto-$(MOSQUITTO_VERSION)/.built: $(DCDBDEPSPATH)/mosquitto-$(MOSQUITTO_VERSION)/.patched
@echo "Building Mosquitto library...";
mkdir -p $(@D)/build;
......@@ -225,12 +211,11 @@ $(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION)/.installed: $(DCDBDEPSPATH)/libuv-v$(LIB
@echo "Installing libuv..."
cd $(@D)/lib && make install && touch $(@)
$(DCDBDEPSPATH)/cpp-driver-$(CPPDRV_VERSION)/.built: $(DCDBDEPSPATH)/cpp-driver-$(CPPDRV_VERSION)/.patched $(DCDBDEPSPATH)/openssl-$(OPENSSL_VERSION)/.built $(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION)/.built
$(DCDBDEPSPATH)/cpp-driver-$(CPPDRV_VERSION)/.built: $(DCDBDEPSPATH)/cpp-driver-$(CPPDRV_VERSION)/.patched $(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION)/.built
@echo "Building cpp-driver..."
mkdir -p $(@D)/build
cd $(@D)/build && \
CC=$(FULL_CC) CXX=$(FULL_CXX) cmake $(CMAKE_CROSS_FLAGS) \
-DOPENSSL_ROOT_DIR=$(DCDBDEPSPATH)/openssl-$(OPENSSL_VERSION) \
-DLIBUV_ROOT_DIR=$(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION) \
-DCASS_BUILD_EXAMPLES=NO \
-DCMAKE_INSTALL_LIBDIR=lib \
......@@ -352,7 +337,7 @@ $(DCDBDEPSPATH)/mariadb-connector-c-$(MARIADBCONNECTOR_VERSION)-src/.built: $(DC
-DINSTALL_LIBDIR=lib \
-DINSTALL_PLUGINDIR=lib \
-DCMAKE_PREFIX_PATH=$(DCDBDEPSPATH)/openssl-$(OPENSSL_VERSION) \
-DCMAKE_C_FLAGS="-L$(DCDBDEPSPATH)/openssl-$(OPENSSL_VERSION) -lcrypto -lssl" \
-DCMAKE_C_FLAGS="-lcrypto -lssl" \
$(@D) && \
make -j $(MAKETHREADS) && \
touch $(@)
......
......@@ -2,7 +2,7 @@ include ../../config.mk
CXXFLAGS += -I../../common/include/ -I../../lib/include -I$(DCDBDEPLOYPATH)/include
OBJS = dcdbconfig.o sensoraction.o dbaction.o jobaction.o useraction.o
LIBS = -L../../lib -L$(DCDBDEPLOYPATH)/lib -ldcdb -lboost_random -lboost_system -lboost_date_time -lboost_regex -lssl -lcrypto -lpthread
LIBS = -L../../lib -L$(DCDBDEPLOYPATH)/lib -ldcdb -lboost_random -lboost_system -lboost_date_time -lboost_regex -lpthread
# GCC 4.8 is broken
ifeq ($(findstring 4.8, $(shell $(CXX) --version)), 4.8)
SLIBS = $(DCDBDEPLOYPATH)/lib/libboost_random.a $(DCDBDEPLOYPATH)/lib/libboost_system.a
......
......@@ -2,7 +2,7 @@ include ../../config.mk
CXXFLAGS += -I../../common/include/ -I../../lib/include -I$(DCDBDEPLOYPATH)/include
OBJS = dcdbcsvimport.o
LIBS = -L../../lib -L$(DCDBDEPLOYPATH)/lib -ldcdb -lboost_random -lboost_system -lboost_date_time -lboost_regex -lssl -lcrypto -lpthread
LIBS = -L../../lib -L$(DCDBDEPLOYPATH)/lib -ldcdb -lboost_random -lboost_system -lboost_date_time -lboost_regex -lpthread
TARGET = dcdbcsvimport
.PHONY : clean install
......
......@@ -2,7 +2,7 @@ include ../../config.mk
CXXFLAGS += -I../../common/include/ -I../../lib/include -I$(DCDBDEPLOYPATH)/include
OBJS = dcdbquery.o query.o
LIBS = -L../../lib -L$(DCDBDEPLOYPATH)/lib -ldcdb -lboost_random -lboost_system -lboost_date_time -lboost_regex -lssl -lcrypto -lpthread
LIBS = -L../../lib -L$(DCDBDEPLOYPATH)/lib -ldcdb -lboost_random -lboost_system -lboost_date_time -lboost_regex -lpthread
TARGET = dcdbquery
.PHONY : clean install
......
......@@ -2,7 +2,7 @@ include ../../config.mk
CXXFLAGS += -I../../common/include/ -I../../lib/include -I$(DCDBDEPLOYPATH)/include
OBJS = dcdbslurmjob.o
LIBS = -L../../lib -L$(DCDBDEPLOYPATH)/lib -ldcdb -lmosquitto -lboost_random -lboost_system -lboost_date_time -lboost_regex -lssl -lcrypto -lpthread
LIBS = -L../../lib -L$(DCDBDEPLOYPATH)/lib -ldcdb -lmosquitto -lboost_random -lboost_system -lboost_date_time -lboost_regex -lpthread
TARGET = dcdbslurmjob
.PHONY : clean install
......
......@@ -2,7 +2,7 @@ include ../../config.mk
CXXFLAGS += -I../../common/include/ -I../../lib/include -I$(DCDBDEPLOYPATH)/include
OBJS = dcdbunitconv.o
LIBS = -L../../lib -L$(DCDBDEPLOYPATH)/lib -ldcdb -lboost_random -lboost_system -lboost_date_time -lboost_regex -lssl -lcrypto -lpthread
LIBS = -L../../lib -L$(DCDBDEPLOYPATH)/lib -ldcdb -lboost_random -lboost_system -lboost_date_time -lboost_regex -lpthread
TARGET = dcdbunitconv
.PHONY : clean install
......
Supports Markdown
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