Commit 7b4448c1 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum

[FIX] hardening options where not applied for libeep in deb build. This is fixed

parent 7a8b7c66
......@@ -140,12 +140,12 @@ SET( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -DDEBUG -O2" CACHE STRING "" FORCE )
# Allow injection of other flags
# NOTE: do not set these variables somewhere in cmake. They are intended to be used when calling CMake from the command line.
# Utilize this
SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OW_LD_FLAGS_INJECT}" FORCE )
SET( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OW_LD_FLAGS_INJECT}" FORCE )
SET( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OW_LD_FLAGS_INJECT}" FORCE )
SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OW_CXX_FLAGS_INJECT}" )
SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OW_C_FLAGS_INJECT}" )
# Utilize this to append build flags from external systems (like dpkg-buildflags).
SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OW_LD_FLAGS_INJECT}" CACHE STRING "" FORCE )
SET( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OW_LD_FLAGS_INJECT}" CACHE STRING "" FORCE )
SET( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OW_LD_FLAGS_INJECT}" CACHE STRING "" FORCE )
SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OW_CXX_FLAGS_INJECT}" CACHE STRING "" FORCE )
SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OW_C_FLAGS_INJECT}" CACHE STRING "" FORCE )
ADD_DEFINITIONS( ${OW_CPP_FLAGS_INJECT} )
# -----------------------------------------------------------------------------------------------------------------------------------------------
......
......@@ -5,7 +5,7 @@
IF( CMAKE_GENERATOR MATCHES "Visual Studio" )
SET( CMAKE_C_FLAGS "/TC /DWIN32")
ELSE()
SET( CMAKE_C_FLAGS "-w")
SET( CMAKE_C_FLAGS "-w ${OW_C_FLAGS_INJECT}" )
ENDIF()
FILE( GLOB LIBEEP_SRC "libavr/*.c" "libcnt/*.c" "libeep/*.c" )
......
......@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 8.0.0),
libbiosig-dev (>= 0.85.0),
libnifti-dev (>= 2.0.0),
zlib1g-dev (>= 1:1.2.3.4.dfsg)
Standards-Version: 3.9.3
Standards-Version: 3.9.2
Homepage: http://www.openwalnut.org
......
......@@ -11,9 +11,9 @@
override_dh_auto_build:
# Invoke standard build mechanism.
dh_auto_build
# dh_auto_build
# Enable this if you have a multi-core machine and are debugging the debian packages. Disable again for upload.
# dh_auto_build -- -j16
dh_auto_build -- -j16
# build the core api documentation too
dh_auto_build -- core_devdoc
......@@ -33,6 +33,7 @@ override_dh_auto_configure:
-DOW_MODULE_TOOLBOX_IO=ON\
-DOW_MODULE_TOOLBOX_IMAGEPROCESSING=ON\
-DOW_MODULE_TOOLBOX_OTHERS=ON\
-DOW_C_FLAGS_INJECT="$(shell dpkg-buildflags --get CFLAGS)"\
-DOW_CXX_FLAGS_INJECT="$(shell dpkg-buildflags --get CXXFLAGS)"\
-DOW_LD_FLAGS_INJECT="$(shell dpkg-buildflags --get LDFLAGS)"\
-DOW_CPP_FLAGS_INJECT="$(shell dpkg-buildflags --get CPPFLAGS)"
......
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