unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob 490173eb9b291ec750bba5faa801aeca7844f6b1 2092 bytes (raw)
name: gnu/packages/patches/rtags-separate-rct.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
 
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_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")
 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}"
-    "-DOS_${CMAKE_SYSTEM_NAME}"
-    ${RCT_DEFINITIONS})
+    "-DOS_${CMAKE_SYSTEM_NAME}")
 
 if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
     add_definitions(-D__LONG_LONG_SUPPORTED)
@@ -214,7 +205,7 @@ if (RTAGS_COTIRE)
     cotire(rtags)
 endif ()
 
-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 "")
@@ -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} 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)
 
 add_executable(rdm rdm.cpp)
-target_link_libraries(rdm ${RTAGS_LIBRARIES})
+target_link_libraries(rdm ${RTAGS_LIBRARIES} rct)
 
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 
 add_executable(rp rp.cpp)
-target_link_libraries(rp ${RTAGS_LIBRARIES})
+target_link_libraries(rp ${RTAGS_LIBRARIES} rct)
 
 if (CYGWIN)
     EnsureLibraries(rdm rct)

debug log:

solving 490173eb9b ...
found 490173eb9b in https://yhetil.org/guix-patches/20201031141118.21536-1-malte.f.gerdes@gmail.com/
found 533e28b02e in https://git.savannah.gnu.org/cgit/guix.git
preparing index
index prepared:
100644 533e28b02eb40538ed7dea9a694af030cb54e6e0	gnu/packages/patches/rtags-separate-rct.patch

applying [1/1] https://yhetil.org/guix-patches/20201031141118.21536-1-malte.f.gerdes@gmail.com/
diff --git a/gnu/packages/patches/rtags-separate-rct.patch b/gnu/packages/patches/rtags-separate-rct.patch
index 533e28b02e..490173eb9b 100644

Checking patch gnu/packages/patches/rtags-separate-rct.patch...
Applied patch gnu/packages/patches/rtags-separate-rct.patch cleanly.

index at:
100644 490173eb9b291ec750bba5faa801aeca7844f6b1	gnu/packages/patches/rtags-separate-rct.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.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).