Merge pull request #208 from Tokutek/merge-libs

update TokuMergeLibs to support Tokutek/mongo#983

cmake/merge_archives_unix.cmake.in

@@ -26,15 +26,52 @@ SET(CMAKE_RANLIB "@CMAKE_RANLIB@")
 
 SET(TEMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/merge_archives_${TARGET})
 MAKE_DIRECTORY(${TEMP_DIR})
-# Extract each archive to its own subdirectory(avoid object filename clashes)
+# Extract each archive to its own subdirectory(avoid object filename
+# clashes) Since the lib may contain objects with the same name, we first
+# list the archive contents, then uniquify the object names as we extract
+# them.
 FOREACH(LIB ${STATIC_LIBS})
   GET_FILENAME_COMPONENT(NAME_NO_EXT ${LIB} NAME_WE)
   SET(TEMP_SUBDIR ${TEMP_DIR}/${NAME_NO_EXT})
   MAKE_DIRECTORY(${TEMP_SUBDIR})
   EXECUTE_PROCESS(
-    COMMAND ${CMAKE_AR} -x ${LIB}
-    WORKING_DIRECTORY ${TEMP_SUBDIR}
+    COMMAND ${CMAKE_AR} -t ${LIB}
+    OUTPUT_VARIABLE LIB_OBJS
     )
+  STRING(REGEX REPLACE "\n" ";" LIB_OBJ_LIST "${LIB_OBJS}")
+  STRING(REGEX REPLACE ";$" "" LIB_OBJ_LIST "${LIB_OBJ_LIST}")
+
+  LIST(LENGTH LIB_OBJ_LIST LENGTH_WITH_DUPS)
+  SET(LIB_OBJ_LIST_NO_DUPS ${LIB_OBJ_LIST})
+  LIST(REMOVE_DUPLICATES LIB_OBJ_LIST_NO_DUPS)
+  LIST(LENGTH LIB_OBJ_LIST_NO_DUPS LENGTH_WITHOUT_DUPS)
+
+  IF(LENGTH_WITH_DUPS EQUAL LENGTH_WITHOUT_DUPS)
+    # Optimization for when lib doesn't actually have duplicate object
+    # names, we can just extract everything.
+    EXECUTE_PROCESS(
+      COMMAND ${CMAKE_AR} -x ${LIB}
+      WORKING_DIRECTORY ${TEMP_SUBDIR}
+      )
+  ELSE()
+    LIST(SORT LIB_OBJ_LIST)
+    SET(SAME_OBJ_COUNT 1)
+    SET(LAST_OBJ_NAME)
+    FOREACH(OBJ ${LIB_OBJ_LIST})
+      IF(OBJ STREQUAL LAST_OBJ_NAME)
+        GET_FILENAME_COMPONENT(OBJ_NO_EXT ${OBJ} NAME_WE)
+        FILE(RENAME "${TEMP_SUBDIR}/${OBJ}" "${TEMP_SUBDIR}/${OBJ_NO_EXT}.${SAME_OBJ_COUNT}.o")
+        MATH(EXPR SAME_OBJ_COUNT "${SAME_OBJ_COUNT}+1")
+      ELSE()
+        SET(SAME_OBJ_COUNT 1)
+      ENDIF()
+      SET(LAST_OBJ_NAME "${OBJ}")
+      EXECUTE_PROCESS(
+        COMMAND ${CMAKE_AR} -xN ${SAME_OBJ_COUNT} ${LIB} ${OBJ}
+        WORKING_DIRECTORY ${TEMP_SUBDIR}
+        )
+    ENDFOREACH()
+  ENDIF()
 
   FILE(GLOB_RECURSE LIB_OBJECTS "${TEMP_SUBDIR}/*.o")
   SET(OBJECTS ${OBJECTS} ${LIB_OBJECTS})
@@ -51,11 +88,7 @@ ENDFOREACH()
 FILE(TO_NATIVE_PATH ${TARGET_LOCATION} ${TARGET_LOCATION})
 # Now pack the objects into library with ar.
 EXECUTE_PROCESS(
-  COMMAND ${CMAKE_AR} -r ${TARGET_LOCATION} ${ALL_OBJECTS}
-  WORKING_DIRECTORY ${TEMP_DIR}
-)
-EXECUTE_PROCESS(
-  COMMAND ${CMAKE_RANLIB} ${TARGET_LOCATION}
+  COMMAND ${CMAKE_AR} rcs ${TARGET_LOCATION} ${ALL_OBJECTS}
   WORKING_DIRECTORY ${TEMP_DIR}
 )
 

cmake_modules/TokuMergeLibs.cmake

@@ -50,7 +50,7 @@ MACRO(TOKU_MERGE_STATIC_LIBS TARGET OUTPUT_NAME LIBS_TO_MERGE)
   ENDFOREACH()
   IF(OSLIBS)
     LIST(REMOVE_DUPLICATES OSLIBS)
-    TARGET_LINK_LIBRARIES(${TARGET} ${OSLIBS})
+    TARGET_LINK_LIBRARIES(${TARGET} LINK_PUBLIC ${OSLIBS})
   ENDIF()
 
   # Make the generated dummy source file depended on all static input