Currently job artifacts in CI/CD pipelines on LRZ GitLab never expire. Starting from Wed 26.1.2022 the default expiration time will be 30 days (GitLab default). Currently existing artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

Commit 253cb316 authored by Axel Auweter's avatar Axel Auweter
Browse files

Linux (Ubuntu 12.04) compile fixes.

Yet another small change to the OpenIPMI patch as 12.04 in my config seems to run autoconf/automake itself resulting in the reintroduction of the ncurses dependency.
DCDBLib build now has the correct parameters to build a Linux shared libary. Also DCDBLib now shows the hint on setting LD_LIBRARY_PATH/DYLD_LIBRARY_PATH again.
CollectAgent needs -lthrift to link (because otherwise the missing symbols from libdcdb.so will remain unresolved).
Top level Makefile now detects the number of CPU cores under Linux and adjusts MAKETHREADS variable automatically.
parent 75179192
include ../config.mk
CXXFLAGS = -O0 -g --std=c++11 -Wall -fmessage-length=0 -I$(DCDBDEPLOYPATH)/include/
CXXFLAGS = -O0 -g --std=c++11 -Wall -Wno-unused-local-typedefs -Wno-unknown-warning-option -fmessage-length=0 -I$(DCDBDEPLOYPATH)/include/
OBJS = collectagent.o \
simplemqttserver.o \
simplemqttserverthread.o \
simplemqttservermessage.o
LIBS = -L$(DCDBDEPLOYPATH)/lib/ -ldcdb -lpthread -lboost_system -lboost_thread
LIBS = -L$(DCDBDEPLOYPATH)/lib/ -ldcdb -lpthread -lboost_system -lboost_thread -lthrift
TARGET = collectagent
.PHONY : clean install
......
include ../config.mk
# C++ Compiler Flags (use fPIC for our dynamic library)
CXXFLAGS = -O0 -g -Wall -Werror -fPIC --std=c++11 -I$(DCDBDEPLOYPATH)/include -I./include -I./include_internal -fmessage-length=0
CXXFLAGS = -O0 -g -Wall -Werror -Wno-unused-local-typedefs -Wno-unknown-warning-option\
-fPIC --std=c++11 -I$(DCDBDEPLOYPATH)/include -I./include -I./include_internal -fmessage-length=0
# List of object files to build and the derived list of corresponding source files
OBJS = src/sensordatastore.o \
......@@ -23,9 +24,12 @@ ifeq ($(OS),Darwin)
DLFLAGS = -dynamiclib
else
TARGET = libdcdb.so
DLFLAGS = -dynamic -Wl,-soname,$(TARGET)
DLFLAGS = -shared -Wl,-soname,$(TARGET) -Wl,--no-undefined
endif
# Determine the expanded path to which the library will be installed
P = $(shell cd $(DCDBDEPLOYPATH)/lib/ && pwd)
# List of Phony Targets
.PHONY : check-thrift-env all clean clean-cassandra-headers install
......@@ -35,23 +39,23 @@ $(TARGET): $(SRC)
$(MAKE) $(OBJS)
@if [ "$(OS)" = "Darwin" ]; then \
echo "Linking library in Mac OS style: $(TARGET)"; \
$(CXX) $(DLFLAGS) -o $(TARGET) $(OBJS) $(LIBS); \
$(CXX) $(CXXFLAGS) $(DLFLAGS) -o $(TARGET) $(OBJS) $(LIBS); \
else \
echo "Linking library in Linux style: $(TARGET)"; \
$(CXX) $(DLFLAGS) -o $(TARGET) $(OBJS) $(LIBS); \
$(CXX) $(CXXFLAGS) $(DLFLAGS) -o $(TARGET) $(OBJS) $(LIBS); \
fi
all: $(TARGET)
# Alert the user to put the necessary paths into LD_LIBRARY_PATH (or similar on other platforms)
check-thrift-env:
@if [ "$U" = "Darwin" ]; then \
@if [ "$(OS)" = "Darwin" ]; then \
R=`echo $$DYLD_LIBRARY_PATH | grep $P`; \
if [ "$$R" = "" ]; then \
printf "\n******************************************\nPlease type the following line before running:\n export DYLD_LIBRARY_PATH=$$DYLD_LIBRARY_PATH:$P\n******************************************\n"; \
fi; \
fi
@if [ "$U" = "Linux" ]; then \
@if [ "$(OS)" = "Linux" ]; then \
R=`echo $$LD_LIBRARY_PATH | grep $P`; \
if [ "$$R" = "" ]; then \
printf "\n******************************************\nPlease type the following line before running:\n export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$P\n******************************************\n"; \
......
......@@ -9,7 +9,8 @@ DISTFILES = thrift-0.9.1.tar.gz;https://dist.apache.org/repos/dist/release/thrif
OpenIPMI-2.0.19.tar.gz;http://optimate.dl.sourceforge.net/project/openipmi/OpenIPMI%202.0%20Library/OpenIPMI-2.0.19.tar.gz \
boost_1_55_0.tar.gz;http://netcologne.dl.sourceforge.net/project/boost/boost/1.55.0/boost_1_55_0.tar.gz
FETCH = wget -c --no-check-certificate -O -
MAKETHREADS ?= $(if $(findstring $(shell uname),Darwin),$(shell sysctl machdep.cpu.thread_count | cut -b 27-),4)
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))
CASSANDRA_CLUSTER_NAME = Datacenter Monitor Database
CASSANDRA_FLUSH_LARGEST_MEMTABLES_AT = 0.5
......
......@@ -132,12 +132,14 @@ diff -r -U3 OpenIPMI-2.0.19/Makefile.am OpenIPMI-2.0.19-patched/Makefile.am
@@ -2,16 +2,16 @@
RPMFLAGS = -ta
SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \
-SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \
- ui lanserv sample doc man $(SWIG_DIR)
+SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) \
+ doc man $(SWIG_DIR)
DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \
-DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \
- ui lanserv sample doc man swig
+DIST_SUBDIRS = include utils lib unix glib tcl \
+ doc man swig
EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \
......
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