From: Yuyi Wang <Strawberry_Str@hotmail.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, gitgitgadget@gmail.com,
Yuyi Wang <Strawberry_Str@hotmail.com>
Subject: Re: [PATCH] Add pcre2 support for cmake build system.
Date: Fri, 20 May 2022 00:18:26 +0800 [thread overview]
Message-ID: <OSYP286MB02627C53ECF2C03B397556E3F8D09@OSYP286MB0262.JPNP286.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <xmqq1qwqts6w.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> 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?
next prev parent reply other threads:[~2022-05-19 16:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-18 3:58 [PATCH] Add pcre2 support for cmake build system Yuyi Wang via GitGitGadget
2022-05-18 22:02 ` Junio C Hamano
2022-05-19 16:18 ` Yuyi Wang [this message]
2022-05-23 18:35 ` Derrick Stolee
2022-05-23 18:36 ` Derrick Stolee
2022-05-24 6:38 ` [PATCH v2 0/2] " Yuyi Wang via GitGitGadget
2022-05-24 6:38 ` [PATCH v2 1/2] Fix CMakeLists.txt on Linux Yuyi Wang via GitGitGadget
2022-05-24 23:04 ` Junio C Hamano
2022-05-24 6:38 ` [PATCH v2 2/2] Add pcre2 support for cmake build system Yuyi Wang via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=OSYP286MB02627C53ECF2C03B397556E3F8D09@OSYP286MB0262.JPNP286.PROD.OUTLOOK.COM \
--to=strawberry_str@hotmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).