8121431

config/software/gitaly.rb

@@ -48,11 +48,18 @@ source git: version.remote
 build do
   env = with_standard_compiler_flags(with_embedded_path)
 
-  # 手动设置编译器和链接器标志
+  # 设置包含路径和链接路径
   env["CFLAGS"] << " -I/opt/gitlab/embedded/include"
   env["LDFLAGS"] << " -L/opt/gitlab/embedded/lib -liconv"
-
   
+  # 为了解决libtinfo.so.6问题添加额外的库路径和LD_LIBRARY_PATH
+  env["LD_LIBRARY_PATH"] = "/opt/gitlab/embedded/lib"
+
+  # 打印出环境变量，帮助调试
+  command "echo 'CFLAGS is #{env["CFLAGS"]}'"
+  command "echo 'LDFLAGS is #{env["LDFLAGS"]}'"
+  command "echo 'LD_LIBRARY_PATH is #{env["LD_LIBRARY_PATH"]}'"
+
   if Build::Check.use_system_ssl?
     env['CMAKE_FLAGS'] = OpenSSLHelper.cmake_flags
     env['PKG_CONFIG_PATH'] = OpenSSLHelper.pkg_config_dirs