From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-3.4 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id 8AB231F4D7 for ; Tue, 24 May 2022 06:39:00 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EcK/vRsi"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232800AbiEXGi5 (ORCPT ); Tue, 24 May 2022 02:38:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232734AbiEXGiy (ORCPT ); Tue, 24 May 2022 02:38:54 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E076295DD3 for ; Mon, 23 May 2022 23:38:52 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id z15so393661wrg.11 for ; Mon, 23 May 2022 23:38:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=agfffC1EWWDgzcKTGFal/q5kCT//8ky54V4ZIn3AaN4=; b=EcK/vRsi5IxFxsbhto36fbRdeKX/HARODBIboU/SbQ5H7muSa/zChgqxKOwDLa1GDX p7yXhwulYYeOTfEk0vQbIzhh7Otn6OstiKWokhgPZD0Px+I0OezA/aTWI/TSkc2JhD+7 goXfy12+lwzYld/YnA5tdRU9VWg6wWAU2YBbyBMj7AgZXjYt+l//g27O24gIUr8PtTm1 mHLMhc5Ck0HTYa6UB8TV+NPc/+Vg8qDICSY21DD7AAjdRUvvrmnwwX+tYYX4fPG3OJoR 8rMrvPVecVkNkIc0RgxG5pMqMAwOVdkIehQTWT6f1QaPpW7sJPkUgt5JRl/G+1oeznsQ NBaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=agfffC1EWWDgzcKTGFal/q5kCT//8ky54V4ZIn3AaN4=; b=jTjsdIvBeeMrrYjaG8v5fntp4xZxBInxFocsuDg5RWw+EAJGF4mXqY0U0KixockE6P pCbCM6kgrIsJdMXn80hsViEdzc7kYN+1+RgF+uwJ2Bsd48uu3XKvbeDiI9g3Gq2DCGt3 I102KHS4yzreIbsGZoJFoUCAi5JrbER1Wo3rRcTgJx8e0UGiP6paQbPHGl3+QJ+LiPpD aOWvo4OQzESiwHymvT90x++gaXmZGndRk9xQErstw75zdPIrFSQeJmjoTr8ar+9K6jUm lVkG7w56yGYW/akO/LyxgjRfbFp+dfEXY7Rz6+kAXLFgN7oHbvpwPpV05TjfQOrvg1Zo 9aOA== X-Gm-Message-State: AOAM530IrwmF1LcQEFFrVXCq3/hw6aNNbj+k14j6dD4EqHxqik7VC2St P65cKqAZq92/kB4CtTT3HGgfR+8lnzQ= X-Google-Smtp-Source: ABdhPJwP8qev3mikXwIYIr+zxfVqQE+GoX5WZzuItNle99i8gkpUaoVDiMomYiOoPCKn53KegOI0/A== X-Received: by 2002:a5d:648f:0:b0:20f:cc1a:3f75 with SMTP id o15-20020a5d648f000000b0020fcc1a3f75mr11274771wri.660.1653374331098; Mon, 23 May 2022 23:38:51 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id n12-20020a05600c500c00b003973b9d0447sm1190975wmr.36.2022.05.23.23.38.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 May 2022 23:38:50 -0700 (PDT) Message-Id: <29cb31e5c502149192c6beb56bf8b372a40711e0.1653374328.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Yuyi Wang via GitGitGadget" Date: Tue, 24 May 2022 06:38:47 +0000 Subject: [PATCH v2 1/2] Fix CMakeLists.txt on Linux. Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Derrick Stolee , Yuyi Wang , Yuyi Wang Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Yuyi Wang CMakeLists.txt didn't follow the grammar of `set`, and it will fail when setting `USE_VCPKG` off on non-Windows platforms. When the platform is Linux, the Makefile adds `compat/linux/procinfo.o` to `COMPAT_OBJS`, but the CMakeLists.txt didn't add `compat/linux/procinfo.c` to `compat_SOURCES`. It would cause linkage error. Signed-off-by: Yuyi Wang --- contrib/buildsystems/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt index 185f56f414f..7f333e303c2 100644 --- a/contrib/buildsystems/CMakeLists.txt +++ b/contrib/buildsystems/CMakeLists.txt @@ -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) @@ -277,7 +277,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") -- gitgitgadget