Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/zmap/files: zmap-1.1.1-json-c.patch
Date: Mon, 30 Dec 2013 09:58:12
Message-Id: 20131230095807.7D6352004E@flycatcher.gentoo.org
1 jlec 13/12/30 09:58:07
2
3 Added: zmap-1.1.1-json-c.patch
4 Log:
5 net-analyzer/zmap: Backport patch for json-c's pkg-config file rename, #496364
6
7 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
8
9 Revision Changes Path
10 1.1 net-analyzer/zmap/files/zmap-1.1.1-json-c.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zmap/files/zmap-1.1.1-json-c.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zmap/files/zmap-1.1.1-json-c.patch?rev=1.1&content-type=text/plain
14
15 Index: zmap-1.1.1-json-c.patch
16 ===================================================================
17 From 08c00b66555612ed69d7f253b277f44cf8da0c62 Mon Sep 17 00:00:00 2001
18 From: Justin Lecher <jlec@g.o>
19 Date: Mon, 30 Dec 2013 10:50:34 +0100
20 Subject: [PATCH] Fix name of josn-c pkg-config file
21
22 Over 2 years ago json-c renamed its pc file from json.pc -> json-c.pc.
23
24 Signed-off-by: Justin Lecher <jlec@g.o>
25 ---
26 CMakeLists.txt | 2 +-
27 1 file changed, 1 insertion(+), 1 deletion(-)
28
29 diff --git a/CMakeLists.txt b/CMakeLists.txt
30 index ebf9316..a9c8e5a 100644
31 --- a/CMakeLists.txt
32 +++ b/CMakeLists.txt
33 @@ -52,7 +52,7 @@ endif()
34
35 if(WITH_JSON)
36 include(FindPkgConfig)
37 - pkg_check_modules(JSON json)
38 + pkg_check_modules(JSON json-c)
39 if(JSON_FOUND)
40 include_directories(JSON_INCLUDE_DIRS)
41 else()
42 --
43 1.8.5.2