From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 3bKXOrpwnV8gBQAA0tVLHw (envelope-from ) for ; Sat, 31 Oct 2020 14:12:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id ONHeNbpwnV+0LwAAbx9fmQ (envelope-from ) for ; Sat, 31 Oct 2020 14:12:10 +0000 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 314C8940430 for ; Sat, 31 Oct 2020 14:12:10 +0000 (UTC) Received: from localhost ([::1]:41778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kYrc1-0007zV-44 for larch@yhetil.org; Sat, 31 Oct 2020 10:12:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYrbu-0007zJ-S0 for guix-patches@gnu.org; Sat, 31 Oct 2020 10:12:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50859) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kYrbu-0008Lp-IF for guix-patches@gnu.org; Sat, 31 Oct 2020 10:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kYrbu-0006cz-DP for guix-patches@gnu.org; Sat, 31 Oct 2020 10:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44342] [PATCH 1/6] gnu: code: Update RTags to 2.38. References: <86sg9uzdy9.fsf@gmail.com> In-Reply-To: <86sg9uzdy9.fsf@gmail.com> Resent-From: Malte Frank Gerdes Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 31 Oct 2020 14:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44342 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44342@debbugs.gnu.org Cc: Malte Frank Gerdes Received: via spool by 44342-submit@debbugs.gnu.org id=B44342.160415349925402 (code B ref 44342); Sat, 31 Oct 2020 14:12:02 +0000 Received: (at 44342) by debbugs.gnu.org; 31 Oct 2020 14:11:39 +0000 Received: from localhost ([127.0.0.1]:34159 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kYrbW-0006bY-CY for submit@debbugs.gnu.org; Sat, 31 Oct 2020 10:11:38 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:35449) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kYrbT-0006ay-UT for 44342@debbugs.gnu.org; Sat, 31 Oct 2020 10:11:36 -0400 Received: by mail-ej1-f65.google.com with SMTP id p5so12529419ejj.2 for <44342@debbugs.gnu.org>; Sat, 31 Oct 2020 07:11:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uQEiLVgC+etxi1cUuGAukY0XjDcdfxuS8xDQoV8AHdM=; b=MQRgDOmnmQqOJEXbJXdVyp1LpQ18fpprq1ZA39Geb2CVqRhM5L6QZaI0VePJcLVXiT AT25DWjMu6JR24AP0zgTIqChnUqVW8Vwpo1n3pfeWUKcacLKUsn0yPI/fVjN29PFeNjO 4V1fVSgSfiAO6crq8nBDe2iTFD2sr0HTlvh0l0cGyGpYdmIxGWJHHyWMlUluVvN/X4TT PnqeVGEa+uzABmV6TnPqCt6nigBdXaOQJrv4VQsM9wyzEAFEDySQvDPBodtkz/XgXB4F OlwEC89UVnYeCNX0pwEE/RakMcRpTGjHSTAYZZay9W44hYQo6x7khsEZZ1FXQBlt4bBy 1Alg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uQEiLVgC+etxi1cUuGAukY0XjDcdfxuS8xDQoV8AHdM=; b=DO026UMTNZ6bo+pWryXTnuhck6qGGypmruBnthmBWf65ey9vm2yWiifYY4i9hOIYw+ 54DD635b2dg4+xWQKO5s3btdzpp4iO5WE0b+HMVojLJeyOYJnGYLWKZl0wAMZm3klGsv 4LPAimOky7C3KCa04V5so97wHueyblABVSqJzeGgcHQ3w0lCQxJ9mXWv6X0mwDtMrGOf wSBSkOyizAot1bPq5xxAe69kd26m9z6cL16+pfJB/U2xRqfnw4ROmOTjPyZrL29Nl8h/ b60H3/sQx3hQbJcp4kbM0rLIHPI9fJ97NMT2JoKpipI74Suj0ct3P5yfbfG8/SnhR9ls +HQg== X-Gm-Message-State: AOAM533orE1YZKA5ZYfciQOHtvNss20j3knOhbNAtTLiOKbZm6//Q6TT x0/tKyDINCmUHKosCsxUJoehGbwisTg= X-Google-Smtp-Source: ABdhPJxaJptOHfRwV4uz60F0IVAvcBRyJ7UHzRfnND7EoidOYMjqYODhWZP8v7fE+6wQq4xw7jWHcw== X-Received: by 2002:a17:906:36cd:: with SMTP id b13mr7625846ejc.235.1604153489718; Sat, 31 Oct 2020 07:11:29 -0700 (PDT) Received: from Remifentanyl.intus (ip-84-118-73-55.unity-media.net. [84.118.73.55]) by smtp.gmail.com with ESMTPSA id k23sm5125898ejk.0.2020.10.31.07.11.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Oct 2020 07:11:29 -0700 (PDT) From: Malte Frank Gerdes Date: Sat, 31 Oct 2020 15:11:13 +0100 Message-Id: <20201031141118.21536-1-malte.f.gerdes@gmail.com> X-Mailer: git-send-email 2.29.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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" X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=gmail.com header.s=20161025 header.b=MQRgDOmn; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: mGKxRz7eJubM * gnu/packages/code.scm (rtags): Update to 2.38 * gnu/packages/patches/rtags-separate-rct.patch: Adjust patch accordingly. --- gnu/packages/code.scm | 5 +- gnu/packages/patches/rtags-separate-rct.patch | 52 +++++++------------ 2 files changed, 23 insertions(+), 34 deletions(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 4e30dacdf4..15307a1e8b 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Julien Lepiller +;;; Copyright © 2020 Malte Frank Gerdes ;;; ;;; This file is part of GNU Guix. ;;; @@ -597,7 +598,7 @@ possible to collect coverage information without special compiler switches.") (define-public rtags (package (name "rtags") - (version "2.18") + (version "2.38") (source (origin (method git-fetch) @@ -619,7 +620,7 @@ possible to collect coverage information without special compiler switches.") #t))) (sha256 (base32 - "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0")))) + "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx")))) (build-system cmake-build-system) (arguments '(#:build-type "RelWithDebInfo" diff --git a/gnu/packages/patches/rtags-separate-rct.patch b/gnu/packages/patches/rtags-separate-rct.patch index 533e28b02e..490173eb9b 100644 --- a/gnu/packages/patches/rtags-separate-rct.patch +++ b/gnu/packages/patches/rtags-separate-rct.patch @@ -1,21 +1,23 @@ -Unbundle RCT and use our own copy. - ---- rtags-2.16/src/CMakeLists.txt 2018-01-23 10:36:17.645855140 +0100 -+++ rtags-2.16/src/CMakeLists.txt 2018-01-23 10:38:14.605234740 +0100 -@@ -105,12 +105,6 @@ if (LUA_ENABLED) - CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=0 -DCMAKE_GENERATOR=${CMAKE_GENERATOR}) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 50883a7a..741ff275 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -135,14 +135,6 @@ if (EXISTS ${CLANG_COMPILATION_INCLUDE}) + add_definitions(-DHAVE_CXCOMPILATIONDATABASE) endif () -set(RCT_RTTI_ENABLED 1) -set(RCT_NO_INSTALL 1) --set(RCT_NO_LIBRARY 1) +-set(RCT_STATIC 1) +-set(RCT_NO_LIBRARY 0) -# Everyting which as been set either in rct/rct.cmake or rct/compiler.cmake -# doesn't need to be set in this file again. -include(rct/rct.cmake) - +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-aliasing=2 -Wcast-qual -fPIC") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wstrict-aliasing=2 -Wcast-qual -fPIC") -@@ -128,8 +122,7 @@ add_definitions( + if (NOT CYGWIN) +@@ -159,8 +151,7 @@ add_definitions( "-DRTAGS_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}" "-DCLANG_LIBDIR=${LIBCLANG_LIBDIR}" "-DCLANG_VERSION=${LIBCLANG_VERSION_STRING}" @@ -25,35 +27,21 @@ Unbundle RCT and use our own copy. if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") add_definitions(-D__LONG_LONG_SUPPORTED) -@@ -172,8 +165,7 @@ set(RTAGS_SOURCES - Symbol.cpp - SymbolInfoJob.cpp - Token.cpp -- TokensJob.cpp -- ${RCT_SOURCES}) -+ TokensJob.cpp) - - if (LUA_ENABLED) - list(APPEND RTAGS_SOURCES AST.cpp) -@@ -195,10 +187,10 @@ endif () +@@ -214,7 +205,7 @@ if (RTAGS_COTIRE) + cotire(rtags) + endif () - include_directories( - ${CMAKE_CURRENT_LIST_DIR} -- ${RCT_INCLUDE_DIRS} - ${CMAKE_CURRENT_LIST_DIR}/selene/include - ${CMAKE_CURRENT_BINARY_DIR}/lua-prefix/src/lua-build -- ${CMAKE_CURRENT_LIST_DIR}/lua/src) -+ ${CMAKE_CURRENT_LIST_DIR}/lua/src -+ ${CMAKE_CURRENT_BINARY_DIR}/include) +-include_directories(${CMAKE_CURRENT_LIST_DIR} ${RCT_INCLUDE_DIRS}) ++include_directories(${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_BINARY_DIR}/include) if (CMAKE_SYSTEM_NAME MATCHES "Darwin") set(START_GROUP "") -@@ -223,17 +215,17 @@ else () - endif() +@@ -237,17 +228,17 @@ endif() + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${RTAGS_BINARY_ROOT_DIR}/bin) # RCT_LIBRARIES and stdc++ library must be at the end --set(RTAGS_LIBRARIES ${RTAGS_LIBRARIES} -lstdc++ ${RCT_LIBRARIES}) -+set(RTAGS_LIBRARIES ${RTAGS_LIBRARIES} -lstdc++) +-set(RTAGS_LIBRARIES ${RTAGS_LIBRARIES} -lstdc++ ${RCT_LIBRARIES} rct) ++set(RTAGS_LIBRARIES ${RTAGS_LIBRARIES} -lstdc++ rct) add_executable(rc rc.cpp) -target_link_libraries(rc ${RTAGS_LIBRARIES}) +target_link_libraries(rc ${RTAGS_LIBRARIES} rct) -- 2.29.1