Commit 49b9fdd6 authored by Micha Mueller's avatar Micha Mueller
Browse files

Merge branch 'gcc9' into development

- adds support for compilation with GCC 9.1
- updates dependencies OpenSSL, BACnet, freeIPMI
parents c1de80a5 0d9bf0fb
......@@ -8,11 +8,11 @@ SOURCEFORGE_MROR = vorboss
CASSANDRA_VERSION = 3.0.18
MOSQUITTO_VERSION = 1.5.5
BOOST_VERSION = 1.70.0
OPENSSL_VERSION = 1.0.2l
OPENSSL_VERSION = 1.1.1c
CPPDRV_VERSION = 2.10.0
LIBUV_VERSION = 1.24.0
BACNET-STACK_VERSION = 0.8.5
FREEIPMI_VERSION = 1.5.5
BACNET-STACK_VERSION = 0.8.6
FREEIPMI_VERSION = 1.6.3
NET-SNMP_VERSION = 5.8
BOOST_VERSION_U = $(subst .,_,$(BOOST_VERSION))
......@@ -30,11 +30,11 @@ DISTFILES = apache-cassandra-$(CASSANDRA_VERSION).tar.gz;http://archive.apache.o
DISTFILES_HASHES = apache-cassandra-3.0.18.tar.gz|94dbdaa58b366166c53f881b8e266bc8;\
mosquitto-1.5.5.tar.gz|a17dffc6f63b2a4ab2eb5c51139e60e9;\
boost_1_70_0.tar.gz|fea771fe8176828fabf9c09242ee8c26;\
openssl-1.0.2l.tar.gz|f85123cd390e864dfbe517e7616e6566;\
openssl-1.1.1c.tar.gz|15e21da6efe8aa0e0768ffd8cd37a5f6;\
cpp-driver-2.10.0.tar.gz|6d15dd2cccd2efd1fdc86089d26971d0;\
libuv-v1.24.0.tar.gz|90320330757253b07404d2a97f59c66b;\
bacnet-stack-0.8.5.tgz|66b69111d91432fa67a7c6c1a653434d;\
freeipmi-1.5.5.tar.gz|b8abfefee0b757f351d8fab777e3c1bb;\
bacnet-stack-0.8.6.tgz|544ebd42ed959deb2213209b66bbc460;\
freeipmi-1.6.3.tar.gz|b2d97e20db9b81b460ce1b9dad5bf54e;\
net-snmp-5.8.tar.gz|63bfc65fbb86cdb616598df1aff6458a
include common.mk
......@@ -137,7 +137,7 @@ $(DCDBDEPSPATH)/openssl-$(OPENSSL_VERSION)/.built: $(DCDBDEPSPATH)/openssl-$(OPE
$(DCDBDEPSPATH)/openssl-$(OPENSSL_VERSION)/.installed: $(DCDBDEPSPATH)/openssl-$(OPENSSL_VERSION)/.built | $(DCDBDEPLOYPATH)
@echo "Installing OpenSSL library..."
cd $(@D) && make install && touch $(@)
cd $(@D) && make install_sw && touch $(@)
$(DCDBDEPSPATH)/mosquitto-$(MOSQUITTO_VERSION)/.built: $(DCDBDEPSPATH)/mosquitto-$(MOSQUITTO_VERSION)/.patched
@echo "Building Mosquitto library...";
......@@ -147,6 +147,7 @@ $(DCDBDEPSPATH)/mosquitto-$(MOSQUITTO_VERSION)/.built: $(DCDBDEPSPATH)/mosquitto
-DWITH_SRV=no \
-DWITH_TLS=yes \
-DWITH_TLS_PSK=yes \
-DDOCUMENTATION=no \
-DCMAKE_INSTALL_PREFIX=$(DCDBDEPLOYPATH)/ \
$(@D) && \
make -j $(MAKETHREADS) && \
......
......@@ -14,9 +14,9 @@ global {
restAPI {
address 127.0.0.1:8080
certificate ../../deps/openssl-1.0.2l/certs/demo/ca-cert.pem
privateKey ../../deps/openssl-1.0.2l/certs/demo/ca-cert.pem
dhFile ../../deps/openssl-1.0.2l/crypto/dh/dh2048.pem
certificate ../../deps/openssl-1.1.1c/test/certs/ca-cert.pem
privateKey ../../deps/openssl-1.1.1c/test/certs/ca-key.pem
dhFile ../../deps/openssl-1.1.1c/crypto/dh/dh2048.pem
user admin {
password admin
......
......@@ -64,6 +64,6 @@ $(DCDBDEPSPATH)/%/.patched: $(DCDBDEPSPATH)/%/.extracted
$(eval P := $(realpath patches))
if [ ! -e $(@) ] && [ -e $(P)/$(*).patch ]; then \
echo Patching: $(*); \
cd $(@D) && (patch -N -p1 < $(P)/$(*).patch || true); \
cd $(@D) && (patch -N -p1 < $(P)/$(*).patch); \
fi
@touch $@
......@@ -6,5 +6,10 @@ DEFAULT_VERSION = 0.3
GIT_VERSION = $(shell git describe --tags 2>/dev/null|sed 's/-\([0-9]*\)/.\1/')
VERSION := $(if $(GIT_VERSION),$(GIT_VERSION),$(DEFAULT_VERSION))
CXXFLAGS = -std=c++11 -O2 -g -Wall -fmessage-length=0 -DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG -DBOOST_LOG_DYN_LINK -DVERSION=\"$(VERSION)\" -Wno-unused-function -Wno-unused-variable
CXXFLAGS = -std=c++11 -O2 -g -Wall -fmessage-length=0 \
-DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG \
-DBOOST_LOG_DYN_LINK -DVERSION=\"$(VERSION)\" \
-Wno-unused-function \
-Wno-unused-variable
OS = $(shell uname -s)
......@@ -12,9 +12,9 @@ global {
restAPI {
address 127.0.0.1:8000
certificate ../../deps/openssl-1.0.2l/certs/demo/ca-cert.pem
privateKey ../../deps/openssl-1.0.2l/certs/demo/ca-cert.pem
dhFile ../../deps/openssl-1.0.2l/crypto/dh/dh2048.pem
certificate ../../deps/openssl-1.1.1c/test/certs/ca-cert.pem
privateKey ../../deps/openssl-1.1.1c/test/certs/ca-key.pem
dhFile ../../deps/openssl-1.1.1c/crypto/dh/dh2048.pem
user admin {
password admin
......
This diff is collapsed.
--- a/CMakeLists.txt 2015-02-06 14:55:56.437712699 +0100
+++ b/CMakeLists.txt 2015-02-06 14:56:45.850837955 +0100
@@ -297,16 +297,7 @@
install(FILES ${INC_FILES} DESTINATION "${INSTALL_HEADERS_DIR}")
endif()
-# Where to put libraries - either lib or lib64.
-get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
-
-if("${LIB64}" STREQUAL "TRUE" AND "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
- set(LIBSUFFIX 64)
-else()
- set(LIBSUFFIX "")
-endif()
-
-set(INSTALL_LIB_DIR "lib${LIBSUFFIX}")
+set(INSTALL_LIB_DIR "lib")
# For windows only
set(INSTALL_DLL_DIR "bin")
diff -u cpp-driver-2.0.1.orig/CMakeLists.txt cpp-driver-2.0.1/CMakeLists.txt
--- cpp-driver-2.0.1.orig/CMakeLists.txt 2015-11-04 20:21:16.000000000 +0100
+++ cpp-driver-2.0.1/CMakeLists.txt 2015-11-04 20:21:48.000000000 +0100
@@ -420,7 +420,7 @@
elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
# Clang/Intel specific compiler options
# I disabled long-long warning because boost generates about 50 such warnings
- set(WARNING_COMPILER_FLAGS "-Wall -pedantic -Wextra -Wno-long-long -Wno-unused-parameter -Wno-variadic-macros -Wno-zero-length-array")
+ set(WARNING_COMPILER_FLAGS "-Wall -pedantic -Wextra -Wno-long-long -Wno-unused-parameter -Wno-variadic-macros -Wno-zero-length-array -Wno-unused-local-typedef")
# OpenSSL is deprecated on later versions of Mac OS X. The long-term solution
# is to provide a CommonCryto implementation.
......@@ -10,3 +10,16 @@ diff -ur cpp-driver-2.10.0-orig/cmake/modules/FindLibuv.cmake cpp-driver-2.10.0/
NO_DEFAULT_PATH)
# Extract version number if possible.
diff -ur distfiles/cpp-driver-2.10.0/cmake/modules/CppDriver.cmake cpp-driver-2.10.0/cmake/modules/CppDriver.cmake
--- distfiles/cpp-driver-2.10.0/cmake/modules/CppDriver.cmake 2018-10-10 14:48:43.000000000 +0200
+++ cpp-driver-2.10.0/cmake/modules/CppDriver.cmake 2019-06-04 20:00:24.768905545 +0200
@@ -835,7 +835,7 @@
elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
# GCC specific compiler options
# I disabled long-long warning because boost generates about 50 such warnings
- set(WARNING_COMPILER_FLAGS "-Wall -pedantic -Wextra -Wno-long-long -Wno-unused-parameter -Wno-variadic-macros")
+ set(WARNING_COMPILER_FLAGS "-Wall -pedantic -Wextra -Wno-deprecated-copy -Wno-long-long -Wno-unused-parameter -Wno-variadic-macros")
if(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL "4.8" OR
CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.8")
diff -ur cpp-netlib-0.12.0-final/boost/network/protocol/http/server/async_connection.hpp cpp-netlib-0.12.0-final.patched/boost/network/protocol/http/server/async_connection.hpp
--- cpp-netlib-0.12.0-final/boost/network/protocol/http/server/async_connection.hpp 2016-03-30 13:38:49.000000000 +0200
+++ cpp-netlib-0.12.0-final.patched/boost/network/protocol/http/server/async_connection.hpp 2018-09-05 09:35:15.000000000 +0200
@@ -378,7 +378,7 @@
boost::throw_exception(std::system_error(*error_encountered));
if (new_start != read_buffer_.begin()) {
input_range input =
- boost::make_iterator_range(new_start, read_buffer_.end());
+ boost::make_iterator_range(new_start, data_end);
buffer_type::iterator start_tmp = new_start;
new_start = read_buffer_.begin();
auto self = this->shared_from_this();
@@ -389,11 +389,12 @@
}
auto self = this->shared_from_this();
- socket().async_read_some(asio::buffer(read_buffer_),
- strand.wrap([this, self, callback](
- std::error_code ec, size_t bytes_transferred) {
- callback(ec, bytes_transferred);
- }));
+ socket().async_read_some(
+ asio::buffer(read_buffer_),
+ strand.wrap([this, self, callback](std::error_code ec,
+ size_t bytes_transferred) {
+ this->wrap_read_handler(callback, ec, bytes_transferred);
+ }));
}
/// Returns a reference to the underlying socket.
--- cpp-netlib-0.9.4.orig/CMakeLists.txt 2012-04-20 19:37:42.000000000 +0200
+++ cpp-netlib-0.9.4/CMakeLists.txt 2016-08-09 10:01:06.261095338 +0200
@@ -7,7 +7,7 @@
project(CPP-NETLIB)
set(Boost_USE_STATIC_LIBS ON)
set(Boost_USE_MULTI_THREADED ON)
-find_package( Boost 1.45.0 REQUIRED unit_test_framework system regex date_time thread filesystem program_options )
+find_package( Boost 1.45.0 REQUIRED system regex date_time thread filesystem program_options )
find_package( OpenSSL )
find_package( Threads )
set(CMAKE_VERBOSE_MAKEFILE true)
@@ -30,11 +30,6 @@
include_directories(${Boost_INCLUDE_DIRS})
enable_testing()
add_subdirectory(libs/network/src)
- add_subdirectory(libs/network/test)
- if (NOT MSVC)
- add_subdirectory(libs/mime/test)
- endif(NOT MSVC)
- add_subdirectory(libs/network/example)
endif(Boost_FOUND)
enable_testing()
--- freeipmi-1.5.5/Makefile.am 2016-10-27 00:41:32.000000000 +0200
+++ freeipmi-1.5.5/Makefile.am 2017-01-25 13:50:49.450235819 +0100
--- freeipmi-1.6.3/Makefile.am 2018-07-31 01:07:25.000000000 +0200
+++ freeipmi-1.6.3/Makefile.am 2019-06-08 10:47:08.139423052 +0200
@@ -3,35 +3,7 @@
ACLOCAL_AMFLAGS = -I config
......@@ -37,9 +37,9 @@
PACKAGE = @PACKAGE@
VERSION = @VERSION@
--- freeipmi-1.5.5/Makefile.in 2016-11-02 23:52:45.000000000 +0100
+++ freeipmi-1.5.5/Makefile.in 2017-01-25 13:50:43.978208271 +0100
@@ -310,35 +310,7 @@
--- freeipmi-1.6.3/Makefile.in 2019-01-24 00:22:16.000000000 +0100
+++ freeipmi-1.6.3/Makefile.in 2019-06-08 10:46:38.879029494 +0200
@@ -417,35 +417,7 @@
# include directory for aclocal
ACLOCAL_AMFLAGS = -I config
SUBDIRS = \
......
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