summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorŁukasz Stelmach <l.stelmach@samsung.com>2017-08-16 10:51:37 +0200
committerŁukasz Stelmach <l.stelmach@samsung.com>2017-08-16 12:01:19 +0200
commit892012b3095bf5a90341c441b757d7d63d3322e6 (patch)
treebfbae8d1b217380644b877d0742f4a21dc0d7961
parentb064f6d5f3caf4eeec75b7160228de986d0059a7 (diff)
downloadejdb-tizen_5.0.tar.gz
ejdb-tizen_5.0.tar.bz2
ejdb-tizen_5.0.zip
Change-Id: If834ee66c2390c7023646d313927495332b942ad Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
-rw-r--r--packaging/ejdb.spec11
-rw-r--r--src/tcbdb/tools/CMakeLists.txt3
-rw-r--r--src/tcfdb/tools/CMakeLists.txt3
-rw-r--r--src/tchdb/tools/CMakeLists.txt3
-rw-r--r--src/tctdb/tools/CMakeLists.txt3
5 files changed, 18 insertions, 5 deletions
diff --git a/packaging/ejdb.spec b/packaging/ejdb.spec
index 38cf159..346d316 100644
--- a/packaging/ejdb.spec
+++ b/packaging/ejdb.spec
@@ -23,6 +23,13 @@ Group: Development
%description devel
This package provides header files and other developer releated files for package %{name}.
+%package bin
+Summary: Tools for dealing with ejdb files
+Group: System/Database
+
+%description bin
+This package provides several command line tools for dealing with EJDB and Tokyo Cabinet files.
+
%prep
%setup -q
cp %{SOURCE1001} .
@@ -47,11 +54,13 @@ EOF
%files
%license LICENSE
%manifest %{name}.manifest
+%{_libdir}/libejdb.so.1*
+
+%files bin
%{_bindir}/jbbmgr
%{_bindir}/jbfmgr
%{_bindir}/jbhmgr
%{_bindir}/jbtmgr
-%{_libdir}/libejdb.so.1*
%docs_package
diff --git a/src/tcbdb/tools/CMakeLists.txt b/src/tcbdb/tools/CMakeLists.txt
index fc1b2bd..b24f0f5 100644
--- a/src/tcbdb/tools/CMakeLists.txt
+++ b/src/tcbdb/tools/CMakeLists.txt
@@ -2,7 +2,8 @@ link_libraries(ejdb_p)
add_executable(jbbmgr jbbmgr.c)
set_target_properties(jbbmgr PROPERTIES
- COMPILE_FLAGS "-DEJDB_STATIC")
+ LINK_FLAGS "-Wl,--as-needed -pie"
+ COMPILE_FLAGS "-DEJDB_STATIC -fPIE")
install(TARGETS jbbmgr
diff --git a/src/tcfdb/tools/CMakeLists.txt b/src/tcfdb/tools/CMakeLists.txt
index 2493f99..02a0a94 100644
--- a/src/tcfdb/tools/CMakeLists.txt
+++ b/src/tcfdb/tools/CMakeLists.txt
@@ -2,7 +2,8 @@ link_libraries(ejdb_p)
add_executable(jbfmgr jbfmgr.c)
set_target_properties(jbfmgr PROPERTIES
- COMPILE_FLAGS "-DEJDB_STATIC")
+ LINK_FLAGS "-Wl,--as-needed -pie"
+ COMPILE_FLAGS "-DEJDB_STATIC -fPIE")
install(TARGETS jbfmgr
FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
diff --git a/src/tchdb/tools/CMakeLists.txt b/src/tchdb/tools/CMakeLists.txt
index f12e3ed..c59f7b0 100644
--- a/src/tchdb/tools/CMakeLists.txt
+++ b/src/tchdb/tools/CMakeLists.txt
@@ -1,7 +1,8 @@
link_libraries(ejdb_p)
add_executable(jbhmgr jbhmgr.c)
set_target_properties(jbhmgr PROPERTIES
- COMPILE_FLAGS "-DEJDB_STATIC")
+ LINK_FLAGS "-Wl,--as-needed -pie"
+ COMPILE_FLAGS "-DEJDB_STATIC -fPIE")
install(TARGETS jbhmgr
FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
diff --git a/src/tctdb/tools/CMakeLists.txt b/src/tctdb/tools/CMakeLists.txt
index e819900..39998d1 100644
--- a/src/tctdb/tools/CMakeLists.txt
+++ b/src/tctdb/tools/CMakeLists.txt
@@ -1,7 +1,8 @@
link_libraries(ejdb_p)
add_executable(jbtmgr jbtmgr.c)
set_target_properties(jbtmgr PROPERTIES
- COMPILE_FLAGS "-DEJDB_STATIC")
+ LINK_FLAGS "-Wl,--as-needed -pie"
+ COMPILE_FLAGS "-DEJDB_STATIC -fPIE")
install(TARGETS jbtmgr
FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}