mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/win-2.49-build-fixes'

Browse Source 
Hotfix to help building Git-for-Windows.

* js/win-2.49-build-fixes:
  cmake: generalize the handling of the `CLAR_TEST_OBJS` list
  meson: fix sorting
  ident: stop assuming that `gw_gecos` is writable
This commit is contained in:
Junio C Hamano
2025-03-06 14:06:31 -08:00
parent bc86ef104a 9709163687
commit a36e024e98
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/buildsystems/CMakeLists.txt
View File

@ -1001,10 +1001,14 @@ parse_makefile_for_sources(unit-test_SOURCES ${CMAKE_SOURCE_DIR}/Makefile "UNIT_
list(TRANSFORM unit-test_SOURCES REPLACE "\\$\\(UNIT_TEST_DIR\\)/" "${CMAKE_SOURCE_DIR}/t/unit-tests/") list(TRANSFORM unit-test_SOURCES REPLACE "\\$\\(UNIT_TEST_DIR\\)/" "${CMAKE_SOURCE_DIR}/t/unit-tests/")
add_library(unit-test-lib STATIC ${unit-test_SOURCES}) add_library(unit-test-lib STATIC ${unit-test_SOURCES})
parse_makefile_for_sources(clar-test_SOURCES ${CMAKE_SOURCE_DIR}/Makefile "CLAR_TEST_OBJS")
list(TRANSFORM clar-test_SOURCES REPLACE "\\$\\(UNIT_TEST_DIR\\)/" "${CMAKE_SOURCE_DIR}/t/unit-tests/")
add_library(clar-test-lib STATIC ${clar-test_SOURCES})
parse_makefile_for_scripts(unit_test_PROGRAMS "UNIT_TEST_PROGRAMS" "") parse_makefile_for_scripts(unit_test_PROGRAMS "UNIT_TEST_PROGRAMS" "")
foreach(unit_test ${unit_test_PROGRAMS}) foreach(unit_test ${unit_test_PROGRAMS})
add_executable("${unit_test}" "${CMAKE_SOURCE_DIR}/t/unit-tests/${unit_test}.c") add_executable("${unit_test}" "${CMAKE_SOURCE_DIR}/t/unit-tests/${unit_test}.c")
target_link_libraries("${unit_test}" unit-test-lib common-main) target_link_libraries("${unit_test}" unit-test-lib clar-test-lib common-main)
set_target_properties("${unit_test}" set_target_properties("${unit_test}"
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/t/unit-tests/bin) PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/t/unit-tests/bin)
if(MSVC) if(MSVC)
@ -1046,13 +1050,13 @@ add_custom_command(OUTPUT "${CMAKE_BINARY_DIR}/t/unit-tests/clar.suite"
VERBATIM) VERBATIM)
add_library(unit-tests-lib ${clar_test_SUITES} add_library(unit-tests-lib ${clar_test_SUITES}
"${CMAKE_SOURCE_DIR}/t/unit-tests/clar/clar.c"
"${CMAKE_BINARY_DIR}/t/unit-tests/clar-decls.h" "${CMAKE_BINARY_DIR}/t/unit-tests/clar-decls.h"
"${CMAKE_BINARY_DIR}/t/unit-tests/clar.suite" "${CMAKE_BINARY_DIR}/t/unit-tests/clar.suite"
) )
target_include_directories(clar-test-lib PUBLIC "${CMAKE_BINARY_DIR}/t/unit-tests")
target_include_directories(unit-tests-lib PUBLIC "${CMAKE_BINARY_DIR}/t/unit-tests") target_include_directories(unit-tests-lib PUBLIC "${CMAKE_BINARY_DIR}/t/unit-tests")
add_executable(unit-tests "${CMAKE_SOURCE_DIR}/t/unit-tests/unit-test.c") add_executable(unit-tests)
target_link_libraries(unit-tests unit-tests-lib common-main) target_link_libraries(unit-tests unit-tests-lib clar-test-lib common-main)
set_target_properties(unit-tests set_target_properties(unit-tests
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/t/unit-tests/bin) PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/t/unit-tests/bin)
if(MSVC) if(MSVC)

2
ident.c
View File

@ -59,7 +59,7 @@ static struct passwd *xgetpwuid_self(int *is_bogus)
static void copy_gecos(const struct passwd *w, struct strbuf *name) static void copy_gecos(const struct passwd *w, struct strbuf *name)
{ {
char *src; const char *src;
/* Traditionally GECOS field had office phone numbers etc, separated /* Traditionally GECOS field had office phone numbers etc, separated
* with commas. Also & stands for capitalized form of the login name. * with commas. Also & stands for capitalized form of the login name.

2
meson.build
View File

@ -1109,11 +1109,11 @@ elif host_machine.system() == 'windows'
libgit_sources += [ libgit_sources += [
'compat/mingw.c', 'compat/mingw.c',
'compat/winansi.c', 'compat/winansi.c',
'compat/win32/dirent.c',
'compat/win32/flush.c', 'compat/win32/flush.c',
'compat/win32/path-utils.c', 'compat/win32/path-utils.c',
'compat/win32/pthread.c', 'compat/win32/pthread.c',
'compat/win32/syslog.c', 'compat/win32/syslog.c',
'compat/win32/dirent.c',
'compat/win32mmap.c', 'compat/win32mmap.c',
'compat/nedmalloc/nedmalloc.c', 'compat/nedmalloc/nedmalloc.c',
] ]