aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-08-29 16:58:54 +0200
committerMarius Bakke <mbakke@fastmail.com>2018-08-29 16:58:54 +0200
commit9e17757ff5d8d5159bda789cf4b3e28105b40adf (patch)
tree84f94de701487e1fe4d4a3b6d73a4bbeaec0b3ec /gnu/packages
parent9587544b447db9a4952b8c368c5600f8ac439ff9 (diff)
downloadguix-9e17757ff5d8d5159bda789cf4b3e28105b40adf.tar
guix-9e17757ff5d8d5159bda789cf4b3e28105b40adf.tar.gz
Revert "gnu: snappy: Optimise."
This causes too many rebuilds for the master branch. This reverts commit f96ed06805db934ff735e80596f1373dc1c2b5a8.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/compression.scm17
-rw-r--r--gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch36
2 files changed, 8 insertions, 45 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 4619f385bb..666c9bfc3e 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1154,15 +1154,14 @@ algorithm within the Numpy framework.")
(package
(name "snappy")
(version "1.1.7")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://github.com/google/snappy/archive/"
- version ".tar.gz"))
- (file-name (string-append "snappy-" version ".tar.gz"))
- (sha256
- (base32 "1m7rcdqzkys5lspj8jcsaah8w33zh28s771bw0ga2lgzfgl05yix"))
- (patches (search-patches "snappy-add-O2-flag-in-CmakeLists.txt.patch"))))
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/google/snappy/archive/"
+ version ".tar.gz"))
+ (file-name (string-append "snappy-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1m7rcdqzkys5lspj8jcsaah8w33zh28s771bw0ga2lgzfgl05yix"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
diff --git a/gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch b/gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch
deleted file mode 100644
index 561763dabe..0000000000
--- a/gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Tobias Geerinckx-Rice <me@tobias.gr>
-Date: Sun, 26 Aug 2018 17:24:42 +0200
-Subject: [PATCH] snappy: Add O2 flag in CmakeLists.txt.
-
-Use ‘-O2’ optimisation when building with CMake, as is already done when
-using the Makefile. This patch was copied verbatim from the Snappy
-mailing list[0].
-
-[0]: <snappy-compression@googlegroups.com>
-
-From 903c72fb29b2db07b4abc38a5feb83d88f739d80 Mon Sep 17 00:00:00 2001
-From: huangwenjun <huangwenjun-hf@loongson.cn>
-Date: Fri, 10 Aug 2018 17:17:35 +0800
-Subject: [PATCH] Add O2 optimize flag in CmakeLists.txt.
-
----
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 62ecd09..29e0cdc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,6 +6,9 @@ set(CMAKE_CXX_STANDARD 11)
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
- set(CMAKE_CXX_EXTENSIONS OFF)
-
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
-+
- # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make
- # it prominent in the GUI.
- option(BUILD_SHARED_LIBS "Build shared libraries(DLLs)." OFF)
---
-2.1.0
-