Restore fix for missing compilation flag warnings

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62ac4217146ded9d67d8d77d8bb7cdaeb19b5125..fbb67306e59ad94ba2b7d89b5087496ddb90651b 100644 (file)
--- 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 (file)
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 f4d0d0f2ff0dceb7315fa5a3a49343e30132e30c..529d5c34ea01fe061eecf84f41c943eac38dc485 100644 (file)
--- 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)