Group :: System/Configuration/Boot and Init
RPM: e4rat
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: e4rat-0.2.3-dynamic-link.patch
Download
Download
diff --git a/e4rat/CMakeLists.txt b/e4rat/CMakeLists.txt
index e6de8d2..5450cbb 100644
--- a/e4rat/CMakeLists.txt
+++ b/e4rat/CMakeLists.txt
@@ -14,7 +14,7 @@ IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX "/" CACHE PATH "e4rat install prefix" FORCE)
ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-set(Boost_USE_STATIC_LIBS ON)
+set(Boost_USE_STATIC_LIBS OFF)
set(Boost_USE_MULTITHREADED OFF)
add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
find_package(Boost 1.41 COMPONENTS system filesystem regex REQUIRED)
diff --git a/e4rat/src/CMakeLists.txt b/e4rat/src/CMakeLists.txt
index 1ea6bc4..ae09f09 100644
--- a/e4rat/src/CMakeLists.txt
+++ b/e4rat/src/CMakeLists.txt
@@ -138,18 +138,13 @@ if(BUILD_CORE_LIBRARY_STATIC)
${${PROJECT_NAME}-core_SRC}
)
else(BUILD_CORE_LIBRARY_STATIC)
- add_library(${PROJECT_NAME}-core SHARED
+ add_library(${PROJECT_NAME}-core STATIC
${${PROJECT_NAME}-core_SRC}
)
- set_target_properties(${PROJECT_NAME}-core PROPERTIES
- SOVERSION 0
- LINK_FLAGS "-static-libgcc -static-libstdc++"
- )
endif(BUILD_CORE_LIBRARY_STATIC)
target_link_libraries(${PROJECT_NAME}-core
${${PROJECT_NAME}_LIBRARIES}
- ${${PROJECT_NAME}_STATIC_LIBRARIES}
)
foreach( EXE ${PROJECT_NAME}-collect
@@ -158,9 +153,6 @@ foreach( EXE ${PROJECT_NAME}-collect
TARGET_LINK_LIBRARIES(${EXE}
${PROJECT_NAME}-core
)
- set_target_properties(${EXE} PROPERTIES
- LINK_FLAGS "-static-libgcc -static-libstdc++"
- )
endforeach( EXE )
###
diff --git a/e4rat/src/cmake/Findaudit.cmake b/e4rat/src/cmake/Findaudit.cmake
index 32ac636..7d14881 100644
--- a/e4rat/src/cmake/Findaudit.cmake
+++ b/e4rat/src/cmake/Findaudit.cmake
@@ -1,7 +1,7 @@
FIND_PATH(AUDIT_INCLUDE_DIR libaudit.h /usr/include
/usr/local/include)
-FIND_LIBRARY(AUDIT_LIBRARY NAMES libaudit.a PATH /usr/lib /usr/local/lib)
+FIND_LIBRARY(AUDIT_LIBRARY NAMES libaudit.so PATH /usr/lib /usr/local/lib)
IF (AUDIT_INCLUDE_DIR AND AUDIT_LIBRARY)
SET(AUDIT_FOUND TRUE)
diff --git a/e4rat/src/cmake/Findauparse.cmake b/e4rat/src/cmake/Findauparse.cmake
index 7db0511..13c5d1e 100644
--- a/e4rat/src/cmake/Findauparse.cmake
+++ b/e4rat/src/cmake/Findauparse.cmake
@@ -1,7 +1,7 @@
FIND_PATH(AUPARSE_INCLUDE_DIR auparse.h /usr/include
/usr/local/include)
-FIND_LIBRARY(AUPARSE_LIBRARY NAMES libauparse.a PATH /usr/lib /usr/local/lib)
+FIND_LIBRARY(AUPARSE_LIBRARY NAMES libauparse.so PATH /usr/lib /usr/local/lib)
IF (AUPARSE_INCLUDE_DIR AND AUPARSE_LIBRARY)
SET(AUPARSE_FOUND TRUE)