Fix packaging issues (hopefully all of the)

xrootd · Jul 14, 2017 · e2d1b84 · e2d1b84
1 parent 1c45a9a
commit e2d1b84
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 59 deletions.
diff --git a/packaging/rhel/xrootd.spec.in b/packaging/rhel/xrootd.spec.in
@@ -733,9 +733,9 @@ fi
 %{_libdir}/libXrdN2No2p-4.so
 %{_libdir}/libXrdOssSIgpfsT-4.so
 %{_libdir}/libXrdServer.so.*
-%{_libdir}/libXrdSsi-4.so.*
+%{_libdir}/libXrdSsi-4.so
 %{_libdir}/libXrdSsiLib.so.*
-%{_libdir}/libXrdSsiLog-4.so.*
+%{_libdir}/libXrdSsiLog-4.so
 %{_libdir}/libXrdSsiShMap.so.*
 %{_libdir}/libXrdThrottle-4.so
 

diff --git a/src/XrdPlugins.cmake b/src/XrdPlugins.cmake
@@ -9,8 +9,6 @@ set( LIB_XRD_N2NO2P     XrdN2No2p-${PLUGIN_VERSION} )
 set( LIB_XRD_PSS        XrdPss-${PLUGIN_VERSION} )
 set( LIB_XRD_GPFS       XrdOssSIgpfsT-${PLUGIN_VERSION} )
 set( LIB_XRD_ZCRC32     XrdCksCalczcrc32-${PLUGIN_VERSION} )
-set( LIB_XRD_SSI        XrdSsi-${PLUGIN_VERSION} )
-set( LIB_XRD_SSILOG     XrdSsiLog-${PLUGIN_VERSION} )
 set( LIB_XRD_THROTTLE   XrdThrottle-${PLUGIN_VERSION} )
 
 #-------------------------------------------------------------------------------
@@ -123,54 +121,6 @@ set_target_properties(
   INTERFACE_LINK_LIBRARIES ""
   LINK_INTERFACE_LIBRARIES "" )
 
-#-------------------------------------------------------------------------------
-# The XrdSsi lib
-#-------------------------------------------------------------------------------
-add_library(
-  ${LIB_XRD_SSI}
-  SHARED
-  XrdSsi/XrdSsiDir.cc                    XrdSsi/XrdSsiDir.hh
-  XrdSsi/XrdSsiFile.cc                   XrdSsi/XrdSsiFile.hh
-  XrdSsi/XrdSsiFileReq.cc                XrdSsi/XrdSsiFileReq.hh
-  XrdSsi/XrdSsiFileSess.cc               XrdSsi/XrdSsiFileSess.hh
-  XrdSsi/XrdSsiSfs.cc                    XrdSsi/XrdSsiSfs.hh
-  XrdSsi/XrdSsiSfsConfig.cc              XrdSsi/XrdSsiSfsConfig.hh
-  XrdSsi/XrdSsiStat.cc
-)
-
-target_link_libraries(
-  ${LIB_XRD_SSI}
-  XrdSsiLib
-  XrdUtils
-  XrdServer )
-
-set_target_properties(
-  ${LIB_XRD_SSI}
-  PROPERTIES
-  INTERFACE_LINK_LIBRARIES ""
-  LINK_INTERFACE_LIBRARIES "" )
-
-#-------------------------------------------------------------------------------
-# The XrdSsiLog lib
-#-------------------------------------------------------------------------------
-add_library(
-  ${LIB_XRD_SSILOG}
-  SHARED
-  XrdSsi/XrdSsiLogging.cc
-)
-
-target_link_libraries(
-  ${LIB_XRD_SSILOG}
-  XrdSsiLib
-  XrdUtils
-  XrdServer )
-
-set_target_properties(
-  ${LIB_XRD_SSILOG}
-  PROPERTIES
-  INTERFACE_LINK_LIBRARIES ""
-  LINK_INTERFACE_LIBRARIES "" )
-
 #-------------------------------------------------------------------------------
 # The XrdThrottle lib
 #-------------------------------------------------------------------------------
@@ -200,5 +150,5 @@ set_target_properties(
 # Install
 #-------------------------------------------------------------------------------
 install(
-  TARGETS ${LIB_XRD_PSS} ${LIB_XRD_BWM} ${LIB_XRD_GPFS} ${LIB_XRD_ZCRC32} ${LIB_XRD_SSI} ${LIB_XRD_SSILOG} ${LIB_XRD_THROTTLE} ${LIB_XRD_N2NO2P}
+  TARGETS ${LIB_XRD_PSS} ${LIB_XRD_BWM} ${LIB_XRD_GPFS} ${LIB_XRD_ZCRC32} ${LIB_XRD_THROTTLE} ${LIB_XRD_N2NO2P}
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
diff --git a/src/XrdSsi.cmake b/src/XrdSsi.cmake
@@ -1,16 +1,22 @@
 
 include( XRootDCommon )
 
+#-------------------------------------------------------------------------------
+# Modules
+#-------------------------------------------------------------------------------
+set( LIB_XRD_SSI        XrdSsi-${PLUGIN_VERSION} )
+set( LIB_XRD_SSILOG     XrdSsiLog-${PLUGIN_VERSION} )
+
 #-------------------------------------------------------------------------------
 # Shared library version
 #-------------------------------------------------------------------------------
-set( XRD_SSI_VERSION   1.0.0 )
-set( XRD_SSI_SOVERSION 1 )
+set( XRD_SSI_LIB_VERSION   1.0.0 )
+set( XRD_SSI_LIB_SOVERSION 1 )
 set( XRD_SSI_SHMAP_VERSION   1.0.0 )
 set( XRD_SSI_SHMAP_SOVERSION 1 )
 
 #-------------------------------------------------------------------------------
-# The XrdSsi library
+# The XrdSsiLib library
 #-------------------------------------------------------------------------------
 add_library(
   XrdSsiLib
@@ -52,8 +58,8 @@ target_link_libraries(
 set_target_properties(
   XrdSsiLib
   PROPERTIES
-  VERSION   ${XRD_SSI_VERSION}
-  SOVERSION ${XRD_SSI_SOVERSION}
+  VERSION   ${XRD_SSI_LIB_VERSION}
+  SOVERSION ${XRD_SSI_LIB_SOVERSION}
   LINK_INTERFACE_LIBRARIES "" )
 
 #-------------------------------------------------------------------------------
@@ -78,9 +84,57 @@ set_target_properties(
   SOVERSION ${XRD_SSI_SHMAP_SOVERSION}
   LINK_INTERFACE_LIBRARIES "" )
 
+#-------------------------------------------------------------------------------
+# The XrdSsi plugin
+#-------------------------------------------------------------------------------
+add_library(
+  ${LIB_XRD_SSI}
+  SHARED
+  XrdSsi/XrdSsiDir.cc                    XrdSsi/XrdSsiDir.hh
+  XrdSsi/XrdSsiFile.cc                   XrdSsi/XrdSsiFile.hh
+  XrdSsi/XrdSsiFileReq.cc                XrdSsi/XrdSsiFileReq.hh
+  XrdSsi/XrdSsiFileSess.cc               XrdSsi/XrdSsiFileSess.hh
+  XrdSsi/XrdSsiSfs.cc                    XrdSsi/XrdSsiSfs.hh
+  XrdSsi/XrdSsiSfsConfig.cc              XrdSsi/XrdSsiSfsConfig.hh
+  XrdSsi/XrdSsiStat.cc
+)
+
+target_link_libraries(
+  ${LIB_XRD_SSI}
+  XrdSsiLib
+  XrdUtils
+  XrdServer )
+
+set_target_properties(
+  ${LIB_XRD_SSI}
+  PROPERTIES
+  INTERFACE_LINK_LIBRARIES ""
+  LINK_INTERFACE_LIBRARIES "" )
+
+#-------------------------------------------------------------------------------
+# The XrdSsiLog plugin
+#-------------------------------------------------------------------------------
+add_library(
+  ${LIB_XRD_SSILOG}
+  SHARED
+  XrdSsi/XrdSsiLogging.cc
+)
+
+target_link_libraries(
+  ${LIB_XRD_SSILOG}
+  XrdSsiLib
+  XrdUtils
+  XrdServer )
+
+set_target_properties(
+  ${LIB_XRD_SSILOG}
+  PROPERTIES
+  INTERFACE_LINK_LIBRARIES ""
+  LINK_INTERFACE_LIBRARIES "" )
+
 #-------------------------------------------------------------------------------
 # Install
 #-------------------------------------------------------------------------------
 install(
-  TARGETS XrdSsiLib XrdSsiShMap
+  TARGETS XrdSsiLib XrdSsiShMap ${LIB_XRD_SSI} ${LIB_XRD_SSILOG}
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )