From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id QMeiCi7k8GVgSwEAe85BDQ:P1 (envelope-from ) for ; Wed, 13 Mar 2024 00:24:30 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id QMeiCi7k8GVgSwEAe85BDQ (envelope-from ) for ; Wed, 13 Mar 2024 00:24:30 +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=GB39bbWK; 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=1710285870; 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=zm92QCmRdY+II97zdgGoaVSTz/1p4KwxnZStaU4E9Ko=; b=sym0G9FJNZpfuyAfvOdoipARSFEX845hJQkaJNucnpYDt6je2Ib+ISWqLjqdCjAu3Dvruh pit8fTwgOB7kjfy/FWVTh6PBz7bRpWJj5yOJMnzDRttbmFjdtEXFlRPwdnqovzZIlWb2i0 P0Bp9JovjpqWz5VIF3vhJpKrR0U2kKiqM1pZSGx4iO4jd1j3TwFco3tjZsrTx3noGeccx+ QgYy7bnJiaXISepzEo8cIzjsyt9aF7Mxv4VFvLmUeqP+H8wVxogNBny+tR0lSmwcBHBG2v lQBUvHYSL7LwEf8lggnJb41/0mpB5rkqNRA9qwuZJvZRTqe8v3oOT2b3u+MgkA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=GB39bbWK; 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=1710285870; a=rsa-sha256; cv=none; b=KRICR9D3y7SsYLVAjC5hsSKcjtIUsAwv+jwt3m91AP7fpUbP833ArJKrp9rIr8ghl8MQXn SFrZ3gOXC/xl6kSSONydk489lswZm85DoppVJKHN15aTftGzW0/pPiajx0XwUNv+HsPk2t tbpDepONxr26ni79wDdknAzeNicLw2rw02FLfGk+Yc5YkkSHoRpMc46j1Ifcl5mi7PZ3Gz dMGf4voEhuakhSsKr7cE3qZMSrS1ElS2wQXnPgXr9mK3b7RbBNnRI7yC103agmsyqyu6s8 ZZijzQEkuw5HXFZ6iK3XI0+17ArUyQq2R2K9zXbRbbuqAlSMzsazFxhYUjDa9w== 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 EF5E7119EC for ; Wed, 13 Mar 2024 00:24:29 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkB10-00010F-MW; Tue, 12 Mar 2024 18:54:34 -0400 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 1rkB04-0000BG-QD for guix-patches@gnu.org; Tue, 12 Mar 2024 18:53:37 -0400 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 1rkB03-0000La-7f for guix-patches@gnu.org; Tue, 12 Mar 2024 18:53:35 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rkB0b-0001nb-Tb for guix-patches@gnu.org; Tue, 12 Mar 2024 18:54:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69591] [PATCH v2 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: Tue, 12 Mar 2024 22:54:09 +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.17102840216670 (code B ref 69591); Tue, 12 Mar 2024 22:54:09 +0000 Received: (at 69591) by debbugs.gnu.org; 12 Mar 2024 22:53:41 +0000 Received: from localhost ([127.0.0.1]:44093 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkB08-0001jQ-AS for submit@debbugs.gnu.org; Tue, 12 Mar 2024 18:53:40 -0400 Received: from mout01.posteo.de ([185.67.36.65]:56955) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkAzi-0001ej-Rb for 69591@debbugs.gnu.org; Tue, 12 Mar 2024 18:53:16 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 89517240027 for <69591@debbugs.gnu.org>; Tue, 12 Mar 2024 23:52:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1710283952; bh=lxHue7KnJOjOt+2cy/oMu+a975rW1LBK7rRWTmDpSdk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=GB39bbWKejfs9JDqlVUlI9WH8MidsymvdgbdkmA2MmXW7p8yMQ1SX7phcm6ub9dff GTUqyWclTlT+LBJ6PCVGBf+fZvibzxmV1If+nMbXyBznkKYYPApnWg3y1Yu9TysoN2 tdqt2/TOCmNY506rLyeY1Nmu1HjjDDEEDD8+0nX6559emdzhxxbLGQvMAXRQ+fikSa dX+A2bzCezGnuE0isXo9xSQaD3m/rheJKBoXCph3ssfBXDTo2WTHYMHs5qmkzQQYeY KD2BAlY5nVdKyfC4W6aMSMKvjhmDbsmYKPB3epigZliaDp8wEEp3TwSqRjiwzOxYW/ 37LleTmCug/3g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TvTS01GHFz6tx2; Tue, 12 Mar 2024 23:52:32 +0100 (CET) From: David Elsing Date: Tue, 12 Mar 2024 22:51:43 +0000 Message-ID: <20240312225211.16427-15-david.elsing@posteo.net> In-Reply-To: <20240312224712.15578-1-david.elsing@posteo.net> References: <20240312224712.15578-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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: 4.01 X-Spam-Score: 4.01 X-Migadu-Queue-Id: EF5E7119EC X-TUID: uYnmDdT3Sd/N * 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 a210ca0313..93d82a7d72 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -524,11 +524,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