bug#30468214 NOT POSSIBLE TO BUILD WITH NINJA - fix jdbc build

It did not work for jdbc because of build location being jdbc/ instead of the root build folder.

Author: Rafal Somla

cmake/libutils/merge_archives.cmake.in

@@ -126,10 +126,20 @@ function(main)
   #
 
   if(MSBUILD)
+
     parse_build_log_msbuild("${BUILD_LOG}")
+    set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR})
+
   else()
+ 
     # In this case BUILD_LOG contains extracted linker options, one per line
+    # but the first line is the working directory in which the linker was
+    # invoked (important for resolving relative paths)
+  
     file(STRINGS "${BUILD_LOG}" DEPS)
+    list(GET DEPS 0 BUILD_DIR)
+    list(REMOVE_AT DEPS 0) 
+
   endif()
 
   #
@@ -231,6 +241,7 @@ function(merge_libraries_gcc)
         -o "${TARGET}"
         ${link_line}
       RESULT_VARIABLE res
+      WORKING_DIRECTORY ${BUILD_DIR}
     )
 
     if(res)
@@ -325,10 +336,12 @@ function(merge_libraries_gcc)
   execute_process(
     COMMAND ${CMAKE_AR} -r ${TARGET} ${merge_objs}
     RESULT_VARIABLE res
+    WORKING_DIRECTORY ${BUILD_DIR}
   )
   execute_process(
     COMMAND ${CMAKE_RANLIB} ${TARGET}
     RESULT_VARIABLE res1
+    WORKING_DIRECTORY ${BUILD_DIR}
   )
 
   if(res OR res1)
@@ -368,6 +381,7 @@ function(merge_libraries_win)
     OUTPUT_VARIABLE merge_out
     ERROR_VARIABLE  merge_err
     RESULT_VARIABLE merge_res
+    WORKING_DIRECTORY ${BUILD_DIR}
   )
  #message("-- merge_res: ${merge_res}")
 
@@ -435,6 +449,7 @@ function(merge_libraries_apple)
         -o "${TARGET}"
         ${link_line}
       RESULT_VARIABLE res
+      WORKING_DIRECTORY ${BUILD_DIR}
     )
 
     if(res)
@@ -462,6 +477,7 @@ function(merge_libraries_apple)
     ERROR_VARIABLE  merge_err
     RESULT_VARIABLE merge_res
     ERROR_QUIET
+    WORKING_DIRECTORY ${BUILD_DIR}
   )
   #message("-- merge_res: ${merge_res}")
 

cmake/libutils/save_linker_opts.cc

@@ -30,16 +30,27 @@
 
 #include <iostream>
 #include <fstream>
+#include <unistd.h>
 
 using namespace std;
 
 int main(int argc, char* argv[])
 {
+  char pwd[1024];
+
+  if (!getcwd(pwd, sizeof(pwd)))
+    return 1;
+
   //cout << "Got " << argc << " arguments" << endl;
   //cout << "Output file: " << argv[1] << endl;
+  //cout << "pwd: " << pwd << endl;
 
   ofstream out(argv[1]);
 
+  // Note: first line in the output is the working directory
+
+  out << pwd << endl;
+
   // Note: argv[2] is the compiler/linker command
 
   for(unsigned pos=3; pos < argc; pos++)