Fix for 64 bit compatibility.

- Fix hardcoding path.
- Use %cmake to set default paths.

Change-Id: I102e9d18662ec001eafc48c9826405bf427f6910

diff --git a/build/security-server/CMakeLists.txt b/build/security-server/CMakeLists.txt
index d65dd3a..ddc0fb7 100644 (file)
--- a/build/security-server/CMakeLists.txt
+++ b/build/security-server/CMakeLists.txt
@@ -22,5 +22,5 @@ CONFIGURE_FILE(security-server.pc.in security-server.pc @ONLY)
 INSTALL(FILES
     ${CMAKE_BINARY_DIR}/build/security-server/security-server.pc
     DESTINATION
-    lib/pkgconfig
+    ${LIB_INSTALL_DIR}/pkgconfig
     )

diff --git a/build/security-server/security-server.pc.in b/build/security-server/security-server.pc.in
index df49caf..608cb2d 100644 (file)
--- a/build/security-server/security-server.pc.in
+++ b/build/security-server/security-server.pc.in
@@ -1,6 +1,6 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: security-server

diff --git a/packaging/security-server.spec b/packaging/security-server.spec
index 848c953..9885b4d 100644 (file)
--- a/packaging/security-server.spec
+++ b/packaging/security-server.spec
@@ -27,7 +27,6 @@ BuildRequires: pkgconfig(xmlsec1)
 Requires(preun):  systemd
 Requires(post):   systemd
 Requires(postun): systemd
-
 %description
 Security server and utilities
 
@@ -86,10 +85,9 @@ Certificates for wrt.
 %setup -q
 
 %build
-export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib"
+export LDFLAGS+="-Wl,--rpath=%{_libdir}"
 
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-        -DVERSION=%{version}              \
+%cmake . -DVERSION=%{version} \
         -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}
 make %{?jobs:-j%jobs}
 
@@ -103,9 +101,9 @@ cp LICENSE %{buildroot}/usr/share/license/libsecurity-server-client
 install -D %{SOURCE1} %{buildroot}%{_datadir}/security-server.manifest
 install -D %{SOURCE2} %{buildroot}%{_datadir}/libsecurity-server-client.manifest
 
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-install -m 0644 %{SOURCE3} %{buildroot}%{_libdir}/systemd/system/security-server.service
-ln -s ../security-server.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/security-server.service
+mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants
+install -m 0644 %{SOURCE3} %{buildroot}/usr/lib/systemd/system/security-server.service
+ln -s ../security-server.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/security-server.service
 
 
 %preun
@@ -137,25 +135,22 @@ fi
 %files -n security-server
 %manifest %{_datadir}/security-server.manifest
 %defattr(-,root,root,-)
-%{_libdir}/systemd/system/multi-user.target.wants/security-server.service
-%{_libdir}/systemd/system/security-server.service
+/usr/lib/systemd/system/multi-user.target.wants/security-server.service
+/usr/lib/systemd/system/security-server.service
 /usr/share/security-server/mw-list
 %attr(755,root,root) /etc/rc.d/init.d/security-serverd
-#/etc/rc.d/rc3.d/S10security-server
-#/etc/rc.d/rc5.d/S10security-server
 %attr(755,root,root) /usr/bin/security-server
-%attr(755,root,root) /etc/rc.d/init.d/security-serverd
-/usr/share/security-server/mw-list
+
 %{_datadir}/license/%{name}
 
 %files -n libsecurity-server-client
 %manifest %{_datadir}/libsecurity-server-client.manifest
 %defattr(-,root,root,-)
-/usr/lib/libsecurity-server-client.so.*
+%{_libdir}/libsecurity-server-client.so.*
 %{_datadir}/license/libsecurity-server-client
 
 %files -n libsecurity-server-client-devel
 %defattr(-,root,root,-)
-/usr/lib/libsecurity-server-client.so
+%{_libdir}/libsecurity-server-client.so
 /usr/include/security-server/security-server.h
 %{_libdir}/pkgconfig/*.pc

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b2b1569..28ba4c5 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -46,7 +46,6 @@ ADD_LIBRARY(${TARGET_SECURITY_CLIENT} SHARED ${SECURITY_CLIENT_SOURCES})
 SET_TARGET_PROPERTIES(
     ${TARGET_SECURITY_CLIENT}
     PROPERTIES
-        LINK_FLAGS "-module -avoid-version"
         COMPILE_FLAGS "-D_GNU_SOURCE -DSECURITY_SERVER_DEBUG_DLOG -fPIC"
         SOVERSION ${SECURITY_CLIENT_VERSION_MAJOR}
         VERSION ${SECURITY_CLIENT_VERSION}
@@ -58,7 +57,7 @@ TARGET_LINK_LIBRARIES(${TARGET_SECURITY_CLIENT}
 
 ################################################################################
 
-INSTALL(TARGETS ${TARGET_SECURITY_CLIENT} DESTINATION lib)
+INSTALL(TARGETS ${TARGET_SECURITY_CLIENT} DESTINATION ${LIB_INSTALL_DIR})
 
 INSTALL(TARGETS ${TARGET_SECURITY_SERVER} DESTINATION bin)