Compile with 64bit file offset support

Change-Id: I9d8f30ececd6c00338accb5029de711f83cdbea0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6afa86f195a46e91d59fe579dd04e858c7aa75d..36c5dc56ee09ddc923deaaf205ded2540c6e4a7f 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,12 @@ else()
        SET(CXX_STD "c++11")
 endif()
 
-SET(COMPILE_BASE_FLAGS         "-g -fPIC -Werror -Wall -Wl,--as-needed -Wl,--no-whole-archive")
+EXECUTE_PROCESS(COMMAND getconf LFS_CFLAGS OUTPUT_VARIABLE LFS_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+EXECUTE_PROCESS(COMMAND getconf LFS_LDFLAGS OUTPUT_VARIABLE LFS_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+EXECUTE_PROCESS(COMMAND getconf LFS_LIBS OUTPUT_VARIABLE LFS_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+SET(COMPILE_BASE_FLAGS         "-g -fPIC -Werror -Wall -Wl,--as-needed -Wl,--no-whole-archive ${LFS_CFLAGS}")
+
 SET(CMAKE_C_FLAGS_PROFILING    "${COMPILE_BASE_FLAGS} -O0 -pg")
 SET(CMAKE_CXX_FLAGS_PROFILING  "${COMPILE_BASE_FLAGS} -O0 -pg -std=${CXX_STD} -fno-rtti")
 SET(CMAKE_C_FLAGS_DEBUG                "${COMPILE_BASE_FLAGS} -O0 -ggdb")

diff --git a/include/klay/filesystem.h b/include/klay/filesystem.h
index 32fdf6fc48ff5b9b732fc1faade5ca2c9e2fe4cd..5b5282a917a28172299cf390dce85bf95b0d3daa 100644 (file)
--- a/include/klay/filesystem.h
+++ b/include/klay/filesystem.h
@@ -93,7 +93,7 @@ public:
        ino_t getInode() const;
        dev_t getDevice() const;
 
-       size_t size() const;
+       off_t size() const;
 
        void create(mode_t mode);
        void open(int flags);

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index be96c5f3fe391b7e08801f6bdef110032aed90a9..8ad2cec8725289e387b9709dacd4dfaf201b0415 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -61,7 +61,7 @@ INCLUDE_DIRECTORIES(SYSTEM    ${KLAY_INCLUDE}
                                                        ${KLAY_DEPS_INCLUDE_DIRS}
 )
 
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${KLAY_DEPS_LIBRARIES})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${KLAY_DEPS_LIBRARIES} ${LFS_LDFLAGS} ${LFS_LIBS})
 
 INSTALL(TARGETS        ${PROJECT_NAME} DESTINATION     ${LIB_INSTALL_DIR}      COMPONENT DevelopmentLibraries)
 INSTALL(DIRECTORY ${KLAY_INCLUDE}/ DESTINATION ${INCLUDE_INSTALL_DIR})

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ead509b4ac63ac709d77e6d23a89a997d4cf983a..39414e847e1fdff68b2472a9334cc76c40bdec95 100755 (executable)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -40,7 +40,7 @@ PKG_CHECK_MODULES(TEST_DEPS REQUIRED  glib-2.0
 
 INCLUDE_DIRECTORIES(SYSTEM ${TEST_DEPS_INCLUDE_DIRS} ${KLAY_INCLUDE})
 
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${TEST_DEPS_LIBRARIES} klay pthread)
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${TEST_DEPS_LIBRARIES} ${LFS_LDFLAGS} ${LFS_LIBS} klay pthread)
 
 INSTALL(TARGETS        ${PROJECT_NAME}                 DESTINATION bin)
 INSTALL(FILES  data/sample-policy.xml  DESTINATION ${TEST_DATA_INSTALL_DIR})