From ca50c89e416934a586ad6839b2aaba8e7257cc2e Mon Sep 17 00:00:00 2001
From: Domen Vrankar <domen.vrankar@gmail.com>
Date: Wed, 5 Oct 2016 22:31:41 +0200
Subject: CPack/RPM debuginfo package objdump error suppression

objdump prints out error text if file is not an
executable and that should be suppressed as we
don't care about non executable files during that
test
---
 Modules/CPackRPM.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 3bbaae9..8f3f7ca 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -1427,7 +1427,8 @@ function(cpack_rpm_debugsymbol_check INSTALL_FILES WORKING_DIR)
     execute_process(COMMAND "${OBJDUMP_EXECUTABLE}" -h ${WORKING_DIR}/${F}
                     WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}"
                     RESULT_VARIABLE OBJDUMP_EXEC_RESULT
-                    OUTPUT_VARIABLE OBJDUMP_OUT)
+                    OUTPUT_VARIABLE OBJDUMP_OUT
+                    ERROR_QUIET)
     # Check that if the given file was executable or not
     if(NOT OBJDUMP_EXEC_RESULT)
       string(FIND "${OBJDUMP_OUT}" "debug" FIND_RESULT)
-- 
cgit v0.12


From f53b01ff0fdead346f3f63310d4a7359db269fb4 Mon Sep 17 00:00:00 2001
From: Domen Vrankar <domen.vrankar@gmail.com>
Date: Thu, 6 Oct 2016 08:04:58 +0200
Subject: CPack/RPM debuginfo package without binaries

Handle case when a component doesn't contain
any debuginfo symbols.
---
 Modules/CPackRPM.cmake | 65 +++++++++++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 27 deletions(-)

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 8f3f7ca..15b62c7 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -1477,16 +1477,22 @@ function(cpack_rpm_debugsymbol_check INSTALL_FILES WORKING_DIR)
     endif()
   endforeach()
 
-  list(REMOVE_DUPLICATES mkdir_list_)
-  unset(TMP_RPM_DEBUGINFO_INSTALL)
-  foreach(part_ IN LISTS mkdir_list_)
-    string(APPEND TMP_RPM_DEBUGINFO_INSTALL "mkdir -p \"${part_}\"\n")
-  endforeach()
+  list(LENGTH mkdir_list_ len_)
+  if(len_)
+    list(REMOVE_DUPLICATES mkdir_list_)
+    unset(TMP_RPM_DEBUGINFO_INSTALL)
+    foreach(part_ IN LISTS mkdir_list_)
+      string(APPEND TMP_RPM_DEBUGINFO_INSTALL "mkdir -p \"${part_}\"\n")
+    endforeach()
+  endif()
 
-  list(REMOVE_DUPLICATES cp_list_)
-  foreach(part_ IN LISTS cp_list_)
-    string(APPEND TMP_RPM_DEBUGINFO_INSTALL "${part_}\n")
-  endforeach()
+  list(LENGTH cp_list_ len_)
+  if(len_)
+    list(REMOVE_DUPLICATES cp_list_)
+    foreach(part_ IN LISTS cp_list_)
+      string(APPEND TMP_RPM_DEBUGINFO_INSTALL "${part_}\n")
+    endforeach()
+  endif()
 
   if(NOT DEFINED CPACK_RPM_DEBUGINFO_EXCLUDE_DIRS)
     set(CPACK_RPM_DEBUGINFO_EXCLUDE_DIRS /usr /usr/src /usr/src/debug)
@@ -1501,29 +1507,34 @@ function(cpack_rpm_debugsymbol_check INSTALL_FILES WORKING_DIR)
     message("CPackRPM:Debug: CPACK_RPM_DEBUGINFO_EXCLUDE_DIRS= ${CPACK_RPM_DEBUGINFO_EXCLUDE_DIRS}")
   endif()
 
-  list(REMOVE_DUPLICATES additional_sources_)
-  unset(additional_sources_all_)
-  foreach(source_ IN LISTS additional_sources_)
-    string(REPLACE "/" ";" split_source_ " ${source_}")
-    list(REMOVE_AT split_source_ 0)
-    unset(tmp_path_)
-    # Now generate all segments of the path
-    foreach(segment_ IN LISTS split_source_)
-      string(APPEND tmp_path_ "/${segment_}")
-      list(APPEND additional_sources_all_ "${tmp_path_}")
+  list(LENGTH additional_sources_ len_)
+  if(len_)
+    list(REMOVE_DUPLICATES additional_sources_)
+    unset(additional_sources_all_)
+    foreach(source_ IN LISTS additional_sources_)
+      string(REPLACE "/" ";" split_source_ " ${source_}")
+      list(REMOVE_AT split_source_ 0)
+      unset(tmp_path_)
+      # Now generate all segments of the path
+      foreach(segment_ IN LISTS split_source_)
+        string(APPEND tmp_path_ "/${segment_}")
+        list(APPEND additional_sources_all_ "${tmp_path_}")
+      endforeach()
     endforeach()
-  endforeach()
 
-  list(REMOVE_DUPLICATES additional_sources_all_)
-  list(REMOVE_ITEM additional_sources_all_ ${CPACK_RPM_DEBUGINFO_EXCLUDE_DIRS})
+    list(REMOVE_DUPLICATES additional_sources_all_)
+    list(REMOVE_ITEM additional_sources_all_
+      ${CPACK_RPM_DEBUGINFO_EXCLUDE_DIRS})
 
-  unset(TMP_DEBUGINFO_ADDITIONAL_SOURCES)
-  foreach(source_ IN LISTS additional_sources_all_)
-    string(APPEND TMP_DEBUGINFO_ADDITIONAL_SOURCES "${source_}\n")
-  endforeach()
+    unset(TMP_DEBUGINFO_ADDITIONAL_SOURCES)
+    foreach(source_ IN LISTS additional_sources_all_)
+      string(APPEND TMP_DEBUGINFO_ADDITIONAL_SOURCES "${source_}\n")
+    endforeach()
+  endif()
 
   set(TMP_RPM_DEBUGINFO_INSTALL "${TMP_RPM_DEBUGINFO_INSTALL}" PARENT_SCOPE)
-  set(TMP_DEBUGINFO_ADDITIONAL_SOURCES "${TMP_DEBUGINFO_ADDITIONAL_SOURCES}" PARENT_SCOPE)
+  set(TMP_DEBUGINFO_ADDITIONAL_SOURCES "${TMP_DEBUGINFO_ADDITIONAL_SOURCES}"
+    PARENT_SCOPE)
 endfunction()
 
 function(cpack_rpm_variable_fallback OUTPUT_VAR_NAME)
-- 
cgit v0.12