From 303e56bcdf642db74892a5493b42f5481abe147a Mon Sep 17 00:00:00 2001 From: Dimitrios Eftaxiopoulos Date: Sat, 22 Feb 2014 20:19:43 +0200 Subject: [PATCH] Restore fix for missing compilation flag warnings --- CMakeLists.txt | 3 +++ debian/libmgl-lua7.2.0.install | 1 + debian/patches/CMakeLists.txt.patch | 14 ++++++++++++-- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 debian/libmgl-lua7.2.0.install diff --git a/CMakeLists.txt b/CMakeLists.txt index 62ac421..fbb6730 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,6 +12,9 @@ set(MathGL_VERSION_MAJOR 2) set(MathGL_VERSION_MINOR 2.1) set(MathGL_SOVERSION 7.2.0) +set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro") +set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro") +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro") MACRO(MGL_DEPENDENT_OPTION option doc default depends1 force1 depends2 force2) IF(${option}_ISSET MATCHES "^${option}_ISSET$") diff --git a/debian/libmgl-lua7.2.0.install b/debian/libmgl-lua7.2.0.install new file mode 100644 index 0000000..b130e74 --- /dev/null +++ b/debian/libmgl-lua7.2.0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libmgl-lua.so.* \ No newline at end of file diff --git a/debian/patches/CMakeLists.txt.patch b/debian/patches/CMakeLists.txt.patch index f4d0d0f..529d5c3 100644 --- a/debian/patches/CMakeLists.txt.patch +++ b/debian/patches/CMakeLists.txt.patch @@ -1,6 +1,16 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -60,15 +60,15 @@ +@@ -12,6 +12,9 @@ + set(MathGL_VERSION_MINOR 2.1) + set(MathGL_SOVERSION 7.2.0) + ++set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro") ++set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro") ++set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro") + + MACRO(MGL_DEPENDENT_OPTION option doc default depends1 force1 depends2 force2) + IF(${option}_ISSET MATCHES "^${option}_ISSET$") +@@ -60,15 +63,15 @@ option(enable-double "Enable double precision in MathGL library" ON) option(enable-simple "Slightly increase drawing speed but disable mglDataA class") @@ -19,7 +29,7 @@ option(enable-lgpl "Enable only LGPL part of MathGL") option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'") #option(enable-ltdl "Enable loading modules support") -@@ -83,19 +83,19 @@ +@@ -83,19 +86,19 @@ CMAKE_DEPENDENT_OPTION(enable-zlib "Enable zlib support" ON "NOT enable-all" ON) CMAKE_DEPENDENT_OPTION(enable-png "Enable png support" ON "NOT enable-all" ON) -- 2.30.2