From: "Sebastien Fabbro (bicatali)" <bicatali@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in net-fs/cvmfs/files: cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch
Date: Tue, 4 Aug 2015 16:18:46 +0000 (UTC) [thread overview]
Message-ID: <20150804161846.29926118@oystercatcher.gentoo.org> (raw)
bicatali 15/08/04 16:18:46
Modified: cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch
Log:
Fixed geoip patch to only check when server flag is set (bug #556570). Applied upstream.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Revision Changes Path
1.2 net-fs/cvmfs/files/cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/cvmfs/files/cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/cvmfs/files/cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/cvmfs/files/cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch?r1=1.1&r2=1.2
Index: cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/cvmfs/files/cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch 31 Jul 2015 20:09:57 -0000 1.1
+++ cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch 4 Aug 2015 16:18:46 -0000 1.2
@@ -116,8 +116,8 @@
add_dependencies (python-geoip libgeoip)
add_dependencies (geoip python-geoip)
endif (GEOIP_BUILTIN)
---- CMakeLists.txt.orig 2015-02-23 13:51:47.000000000 +0000
-+++ CMakeLists.txt 2015-07-31 17:57:17.019920094 +0000
+--- CMakeLists.txt.orig 2015-08-04 15:33:53.383868890 +0000
++++ CMakeLists.txt 2015-08-04 15:58:03.133842858 +0000
@@ -145,6 +145,12 @@
endif (EXISTS "${CMAKE_SOURCE_DIR}/bootstrap.sh")
@@ -131,7 +131,12 @@
# set some default flags
#
# flags in CMAKE_C**_FLAGS are always passed to the compiler
-@@ -313,8 +319,8 @@
+@@ -309,13 +315,15 @@
+ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIRS})
+ endif (GOOGLETEST_BUILTIN)
+
++if (BUILD_SERVER OR BUILD_UNITTESTS)
+ if (GEOIP_BUILTIN)
include (${LIBGEOIP_BUILTIN_LOCATION}/CVMFS-CMakeLists.txt)
include (${PYTHON_GEOIP_BUILTIN_LOCATION}/CVMFS-CMakeLists.txt)
else (GEOIP_BUILTIN)
@@ -140,5 +145,7 @@
+ find_package (LibGeoIP REQUIRED)
+ find_python_module (GeoIP REQUIRED)
endif (GEOIP_BUILTIN)
++endif (BUILD_SERVER OR BUILD_UNITTESTS)
# required libraries for client and libcvmfs
+ if (BUILD_CVMFS OR BUILD_LIBCVMFS)
reply other threads:[~2015-08-04 16:18 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150804161846.29926118@oystercatcher.gentoo.org \
--to=bicatali@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox