From 8ed9cdce80d78d3466cbd075ff48e40268d38c91 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <mail@cynapses.org>
Date: Thu, 1 Oct 2009 10:19:07 +0200
Subject: Remove --as-needed linker flag.

---
 cmake/Modules/DefineCompilerFlags.cmake | 2 --
 1 file changed, 2 deletions(-)

(limited to 'cmake/Modules')

diff --git a/cmake/Modules/DefineCompilerFlags.cmake b/cmake/Modules/DefineCompilerFlags.cmake
index dafc7996..dcaf8da8 100644
--- a/cmake/Modules/DefineCompilerFlags.cmake
+++ b/cmake/Modules/DefineCompilerFlags.cmake
@@ -48,8 +48,6 @@ if (UNIX AND NOT WIN32)
       add_definitions(-D_FORTIFY_SOURCE=2)
     endif (WITH_FORTIFY_SOURCE)
 
-    # Set linker flags
-    set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed")
   endif (CMAKE_COMPILER_IS_GNUCC)
 endif (UNIX AND NOT WIN32)
 
-- 
cgit 


From 566fda70a53568cc10d4705c84547b44a8379c7e Mon Sep 17 00:00:00 2001
From: Andreas Schneider <mail@cynapses.org>
Date: Fri, 2 Oct 2009 20:16:17 +0200
Subject: Fixed LFS support on unix.

---
 cmake/Modules/DefineCompilerFlags.cmake | 50 ++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 25 deletions(-)

(limited to 'cmake/Modules')

diff --git a/cmake/Modules/DefineCompilerFlags.cmake b/cmake/Modules/DefineCompilerFlags.cmake
index dcaf8da8..112449bc 100644
--- a/cmake/Modules/DefineCompilerFlags.cmake
+++ b/cmake/Modules/DefineCompilerFlags.cmake
@@ -13,31 +13,6 @@ if (UNIX AND NOT WIN32)
       add_definitions(-fPIC)
     endif (WITH_FPIC)
 
-    if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-      # with large file support
-      execute_process(
-        COMMAND
-          getconf LFS64_CFLAGS
-        OUTPUT_VARIABLE
-          _lfs_CFLAGS
-        ERROR_QUIET
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    else (CMAKE_SIZEOF_VOID_P MATCHES "8")
-      # with large file support
-      execute_process(
-        COMMAND
-          getconf LFS_CFLAGS
-        OUTPUT_VARIABLE
-          _lfs_CFLAGS
-        ERROR_QUIET
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-      )
-      string(REGEX REPLACE "[\r\n]" " " "${_lfs_CFLAGS}" "${${_lfs_CFLAGS}}")
-
-      add_definitions(${_lfs_CFLAGS})
-    endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
-
     check_c_compiler_flag("-fstack-protector" WITH_STACK_PROTECTOR)
     if (WITH_STACK_PROTECTOR)
       add_definitions(-fstack-protector)
@@ -49,6 +24,31 @@ if (UNIX AND NOT WIN32)
     endif (WITH_FORTIFY_SOURCE)
 
   endif (CMAKE_COMPILER_IS_GNUCC)
+
+  if (CMAKE_SIZEOF_VOID_P MATCHES "8")
+   # with large file support
+   execute_process(
+     COMMAND
+       getconf LFS64_CFLAGS
+     OUTPUT_VARIABLE
+       _lfs_CFLAGS
+     ERROR_QUIET
+     OUTPUT_STRIP_TRAILING_WHITESPACE
+   )
+ else (CMAKE_SIZEOF_VOID_P MATCHES "8")
+   # with large file support
+   execute_process(
+     COMMAND
+       getconf LFS_CFLAGS
+     OUTPUT_VARIABLE
+       _lfs_CFLAGS
+     ERROR_QUIET
+     OUTPUT_STRIP_TRAILING_WHITESPACE
+   )
+ endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ string(REGEX REPLACE "[\r\n]" " " "${_lfs_CFLAGS}" "${${_lfs_CFLAGS}}")
+ add_definitions(${_lfs_CFLAGS})
+
 endif (UNIX AND NOT WIN32)
 
 # suppress warning about "deprecated" functions
-- 
cgit 


From e78334688fa510a5c859b0367d4d4779efae518a Mon Sep 17 00:00:00 2001
From: Andreas Schneider <mail@cynapses.org>
Date: Fri, 2 Oct 2009 20:19:48 +0200
Subject: Fixed setting of LFS CFLAGS.

---
 cmake/Modules/DefineCompilerFlags.cmake | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'cmake/Modules')

diff --git a/cmake/Modules/DefineCompilerFlags.cmake b/cmake/Modules/DefineCompilerFlags.cmake
index 112449bc..1ec2cf98 100644
--- a/cmake/Modules/DefineCompilerFlags.cmake
+++ b/cmake/Modules/DefineCompilerFlags.cmake
@@ -46,8 +46,10 @@ if (UNIX AND NOT WIN32)
      OUTPUT_STRIP_TRAILING_WHITESPACE
    )
  endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
- string(REGEX REPLACE "[\r\n]" " " "${_lfs_CFLAGS}" "${${_lfs_CFLAGS}}")
- add_definitions(${_lfs_CFLAGS})
+ if (_lfs_CFLAGS)
+   string(REGEX REPLACE "[\r\n]" " " "${_lfs_CFLAGS}" "${${_lfs_CFLAGS}}")
+   add_definitions(${_lfs_CFLAGS})
+ endif (_lfs_CFLAGS)
 
 endif (UNIX AND NOT WIN32)
 
-- 
cgit