From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 2o92AkzH6GWihwAAe85BDQ:P1 (envelope-from ) for ; Wed, 06 Mar 2024 20:43:08 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 2o92AkzH6GWihwAAe85BDQ (envelope-from ) for ; Wed, 06 Mar 2024 20:43:08 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=MaS8spkE; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1709754187; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=JYkYWr3D3/Aqr+Eg0Ab6l46n+ZAs4WF3dvDi7hqPZ3k=; b=J2Jg5Sxmgs5AOPKb9dZ8tWW/bNncGIkSnK+8PZwlmevyPy5IJzRhuOY8DHE+0NpEA/h3pC d0LfSDQAAaQFuoKa53ngjqwleHitFUhhLcgRbP+jpq50seHnsaCGTbZUanoGKOdfbYPq/d tmQtkdcqxZktZikZcsL6ZQSqoehrcKST9sPRy6f/3x6zIzRR8U/1DoacOZ4T5OttqfHcfd j0PCMjkdz2APRlDdJs/onVGvhmbunTFE1q/pYlp6QX/JuM3IfoyvrYLXv/l0D8hURvDhIk 94uCAwuX+dHMEV6kECF+JBGh8oVEwstUJfUxZtVqz79YGSYAp9SLJ2yyP/rSrg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=MaS8spkE; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1709754187; a=rsa-sha256; cv=none; b=LkTJH9YAY+9YFvxKKycpqaTJimTNj9fLP85KbYP8Fn60buwBMtu9SS+AD82ONhoGUTbdMw hn2X0FnZ6x1ZPEr8MwSot4VynrHKVGWhutAYIT/IF7bfxsL/qcYnHRbjqGQntn+n0rgWng reD9wsPcp1g0dsaUuO2JiBDh1/YYQv8fWX9Buh4KvxbIxhdyy7O4DFfaTTH2AW1oyk2XlS jCNOxS/a5LkxzdCc+2XxtLVNg3irKL3ErweQp/UTn7DrzoCUveeTFW4mVeTbkdn5KPqZiF ivDTQ/u8FPIxtdWR/c7IkdMk4Nhy/W7JCD/OLGKmfWN3tsfv5p4EXxtxf/pFug== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BDAEF117D4 for ; Wed, 6 Mar 2024 20:43:07 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhx9w-0002WU-Qs; Wed, 06 Mar 2024 14:42:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rhx9t-0002QM-LZ for guix-patches@gnu.org; Wed, 06 Mar 2024 14:42:33 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rhx9t-0006SI-DW for guix-patches@gnu.org; Wed, 06 Mar 2024 14:42:33 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rhxAO-0008Jd-Ba for guix-patches@gnu.org; Wed, 06 Mar 2024 14:43:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69591] [PATCH 15/31] gnu: clog: Add "-DUSE_SYSTEM_LIBS=ON" configure flag. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Mar 2024 19:43:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69591 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69591@debbugs.gnu.org Cc: David Elsing Received: via spool by 69591-submit@debbugs.gnu.org id=B69591.170975414131784 (code B ref 69591); Wed, 06 Mar 2024 19:43:04 +0000 Received: (at 69591) by debbugs.gnu.org; 6 Mar 2024 19:42:21 +0000 Received: from localhost ([127.0.0.1]:51568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhx9d-0008GP-GJ for submit@debbugs.gnu.org; Wed, 06 Mar 2024 14:42:20 -0500 Received: from mout02.posteo.de ([185.67.36.66]:59041) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhx8z-00089w-LN for 69591@debbugs.gnu.org; Wed, 06 Mar 2024 14:41:41 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 0E334240101 for <69591@debbugs.gnu.org>; Wed, 6 Mar 2024 20:41:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1709754061; bh=bQEJfhcjwdtOAcsY+F17lRws+ZfD0SWLBfVKbOEvIbQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=MaS8spkEuqJd8/t15J9gt1vGKrqlRxdCBi/xg439KrHgLYvTNu9hOIbgCIGnq/wn1 eknyp9sNBk4Wvncol/tVINW/KvPIOoP/bOhClX/uKL1M/dinKdGCh5tCfHc2eznrQa yYisbL4YfHUkJbRz+7OFUiLEpHsi9JhbzxTKK3kFrCXc61HriqRWo8981r8FG8QpQV PNFujMUVioqUUZI9GsSmYyynPo4ydxhnk6rUUdgXzeHX+DvalArIoNtoOn3pPt9fqK uslOSA0bUojnOGepMPMWTBiJpEG+gfX0GcPkOt+qNhj8ccI+EUYhuHBGGpdRKcDjB3 cPLKMTNTMoClA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TqjTm4gqbz6tw3; Wed, 6 Mar 2024 20:41:00 +0100 (CET) From: David Elsing Date: Wed, 6 Mar 2024 19:40:21 +0000 Message-ID: <20240306194037.17992-15-david.elsing@posteo.net> In-Reply-To: <20240306193725.17463-1-david.elsing@posteo.net> References: <20240306193725.17463-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -2.37 X-Spam-Score: -2.37 X-Migadu-Queue-Id: BDAEF117D4 X-Migadu-Scanner: mx13.migadu.com X-TUID: qOnlbB7tk/TU * gnu/packages/parallel.scm (clog)[arguments]: Add "-DUSE_SYSTEM_LIBS=ON" to #:configure-flags. * gnu/packages/patches/clog-fix-shared-build.patch: Adjust patch. --- gnu/packages/parallel.scm | 13 ++++--- .../patches/clog-fix-shared-build.patch | 39 ++----------------- 2 files changed, 12 insertions(+), 40 deletions(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 4dc0bee898..7d53f3a769 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -523,11 +523,14 @@ (define-public clog (inherit (package-source cpuinfo)) (patches (search-patches "clog-fix-shared-build.patch")))) (arguments - (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON") - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ - (chdir "deps/clog")))))) + (list + #:configure-flags + ''("-DBUILD_SHARED_LIBS=ON" + "-DUSE_SYSTEM_LIBS=ON") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "deps/clog")))))) (native-inputs (list googletest)) (inputs '()) (synopsis "C-style logging library based on printf") diff --git a/gnu/packages/patches/clog-fix-shared-build.patch b/gnu/packages/patches/clog-fix-shared-build.patch index bf80544b90..eb305339f5 100644 --- a/gnu/packages/patches/clog-fix-shared-build.patch +++ b/gnu/packages/patches/clog-fix-shared-build.patch @@ -1,50 +1,19 @@ Author: Antero Mejr -Notes: Disabled function visibility hacks and googletest download. Enabled -non-static builds. +Notes: Disabled function visibility hacks. Enabled non-static builds. diff --git a/deps/clog/CMakeLists.txt b/deps/clog/CMakeLists.txt -index 083f519..b7b225a 100644 +index 6e50c41..db02e95 100644 --- a/deps/clog/CMakeLists.txt +++ b/deps/clog/CMakeLists.txt -@@ -38,20 +38,8 @@ SET(CONFU_DEPENDENCIES_SOURCE_DIR ${CMAKE_SOURCE_DIR}/deps - SET(CONFU_DEPENDENCIES_BINARY_DIR ${CMAKE_BINARY_DIR}/deps - CACHE PATH "Confu-style dependencies binary directory") +@@ -55,7 +55,7 @@ IF(CLOG_BUILD_TESTS) + ENDIF() --IF(CLOG_BUILD_TESTS) -- IF(NOT DEFINED GOOGLETEST_SOURCE_DIR) -- MESSAGE(STATUS "Downloading Google Test to ${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest (define GOOGLETEST_SOURCE_DIR to avoid it)") -- CONFIGURE_FILE(cmake/DownloadGoogleTest.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download/CMakeLists.txt") -- EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . -- WORKING_DIRECTORY "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download") -- EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" --build . -- WORKING_DIRECTORY "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download") -- SET(GOOGLETEST_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest" CACHE STRING "Google Test source directory") -- ENDIF() --ENDIF() -- # ---[ clog library -ADD_LIBRARY(clog STATIC src/clog.c) +ADD_LIBRARY(clog src/clog.c) SET_TARGET_PROPERTIES(clog PROPERTIES C_STANDARD 99 C_EXTENSIONS NO) -@@ -74,16 +62,6 @@ INSTALL(TARGETS clog - - # ---[ clog tests - IF(CLOG_BUILD_TESTS) -- # ---[ Build google test -- IF(NOT TARGET gtest) -- IF(MSVC AND NOT CLOG_RUNTIME_TYPE STREQUAL "static") -- SET(gtest_force_shared_crt ON CACHE BOOL "" FORCE) -- ENDIF() -- ADD_SUBDIRECTORY( -- "${GOOGLETEST_SOURCE_DIR}" -- "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest") -- ENDIF() -- - ADD_EXECUTABLE(clog-test test/clog.cc) - SET_TARGET_PROPERTIES(clog-test PROPERTIES - CXX_STANDARD 11 diff --git a/deps/clog/include/clog.h b/deps/clog/include/clog.h index 4143761..aa9000f 100644 --- a/deps/clog/include/clog.h -- 2.41.0