Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Is this "small fix to ensure it builds successfully"? To those who
> do not need/want to use pcre2, is this hunk still needed to "build
> successfully", or is this something that becomes necessary only
> because we have other hunks in this patch to add support to pcre2?
>
> If the former, then perhaps the change deserves to be its own patch
> with own explanation why it is necessary, what breaks without it,
> etc.
There are 2 fixes. They are all needed no matter pcre2 is wanted. I'm
rather surprised that no one has noticed the CMakeLists.txt is broken.
> @@ -54,7 +54,7 @@ set(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/../..)
>
> option(USE_VCPKG "Whether or not to use vcpkg for obtaining dependencies. Only applicable to Windows platforms" ON)
> if(NOT WIN32)
> - set(USE_VCPKG OFF CACHE BOOL FORCE)
> + set(USE_VCPKG OFF CACHE BOOL "" FORCE)
> endif()
>
> if(NOT DEFINED CMAKE_EXPORT_COMPILE_COMMANDS)
This is the first fix. The original line didn't follow the grammar
of `set`, and would simply fail.
> @@ -277,7 +287,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
>
> elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
> add_compile_definitions(PROCFS_EXECUTABLE_PATH="/proc/self/exe" HAVE_DEV_TTY )
> - list(APPEND compat_SOURCES unix-socket.c unix-stream-server.c)
> + list(APPEND compat_SOURCES unix-socket.c unix-stream-server.c compat/linux/procinfo.c)
> endif()
>
> if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
This is the second fix, to solve the linkage error on Linux.
You're right, Junio. These fixes should be their own patch.
Should I remove them? They are still small fixes, I think,
and could I submit the two together in a new patch?
