Gentoo Archives: gentoo-commits

From: Guilherme Amadio <amadio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/cvmfs/files/
Date: Mon, 28 Jun 2021 19:42:52
Message-Id: 1624909037.06a2a4dc6eac81683c0221b0e47ac3a23f9c84ff.amadio@gentoo
1 commit: 06a2a4dc6eac81683c0221b0e47ac3a23f9c84ff
2 Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 28 19:37:17 2021 +0000
4 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 28 19:37:17 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a2a4dc
7
8 net-fs/cvmfs: remove unused patch
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
12
13 net-fs/cvmfs/files/cvmfs-2.7.2-gcc-version.patch | 59 ------------------------
14 1 file changed, 59 deletions(-)
15
16 diff --git a/net-fs/cvmfs/files/cvmfs-2.7.2-gcc-version.patch b/net-fs/cvmfs/files/cvmfs-2.7.2-gcc-version.patch
17 deleted file mode 100644
18 index ff76b574670..00000000000
19 --- a/net-fs/cvmfs/files/cvmfs-2.7.2-gcc-version.patch
20 +++ /dev/null
21 @@ -1,59 +0,0 @@
22 -From cdeb988a7ece84191ec3496d55b99d82ca9face5 Mon Sep 17 00:00:00 2001
23 -From: Guilherme Amadio <amadio@××××.ch>
24 -Date: Fri, 19 Jun 2020 11:19:14 +0200
25 -Subject: [PATCH] Remove broken version checks which fail for GCC 10
26 -
27 ----
28 - cmake/Modules/cvmfs_compiler.cmake | 27 +++------------------------
29 - 1 file changed, 3 insertions(+), 24 deletions(-)
30 -
31 -diff --git a/cmake/Modules/cvmfs_compiler.cmake b/cmake/Modules/cvmfs_compiler.cmake
32 -index 2560d231c..e473467b3 100644
33 ---- a/cmake/Modules/cvmfs_compiler.cmake
34 -+++ b/cmake/Modules/cvmfs_compiler.cmake
35 -@@ -35,33 +35,12 @@ set (ENV{LDFLAGS} "${LDFLAGS}")
36 - #
37 - set (CVMFS_FIX_FLAGS "")
38 - set (CVMFS_OPT_FLAGS "-Os")
39 --if (CMAKE_COMPILER_IS_GNUCC)
40 -- message (STATUS "checking gcc version...")
41 -- execute_process (
42 -- COMMAND ${CMAKE_C_COMPILER} -v
43 -- OUTPUT_VARIABLE CVMFS_GCC_VERSION
44 -- ERROR_VARIABLE CVMFS_GCC_VERSION
45 -- )
46 -- STRING(REGEX REPLACE ".*([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" CVMFS_GCC_MAJOR "${CVMFS_GCC_VERSION}")
47 -- STRING(REGEX REPLACE ".*[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" CVMFS_GCC_MINOR "${CVMFS_GCC_VERSION}")
48 -- if (${CVMFS_GCC_MAJOR} LESS 4)
49 -- message (FATAL_ERROR "GCC < 4.1 unsupported")
50 -- endif (${CVMFS_GCC_MAJOR} LESS 4)
51 -- if (${CVMFS_GCC_MAJOR} EQUAL 4)
52 -- if (${CVMFS_GCC_MINOR} LESS 2)
53 -- set (CVMFS_OPT_FLAGS "-O1")
54 -- endif (${CVMFS_GCC_MINOR} LESS 2)
55 -- endif (${CVMFS_GCC_MAJOR} EQUAL 4)
56 -- if (${CVMFS_GCC_MAJOR} GREATER 6)
57 -- set (CVMFS_FIX_FLAGS "-Wno-format-truncation")
58 -- endif (${CVMFS_GCC_MAJOR} GREATER 6)
59 --endif (CMAKE_COMPILER_IS_GNUCC)
60 - message (STATUS "using compiler opt flag ${CVMFS_OPT_FLAGS}")
61 - set (CVMFS_BASE_C_FLAGS "${CVMFS_OPT_FLAGS} -g -fno-strict-aliasing -fasynchronous-unwind-tables -fno-omit-frame-pointer -fwrapv -fvisibility=hidden -Wall ${CVMFS_FIX_FLAGS}")
62 - if (APPLE)
63 -- if (${CMAKE_SYSTEM_VERSION} GREATER 14.5.0)
64 -+ if (${CMAKE_SYSTEM_VERSION} VERSION_GREATER 14.5.0)
65 - set(CVMFS_BASE_C_FLAGS "${CVMFS_BASE_C_FLAGS} -mmacosx-version-min=10.11")
66 -- endif(${CMAKE_SYSTEM_VERSION} GREATER 14.5.0)
67 -+ endif(${CMAKE_SYSTEM_VERSION} VERSION_GREATER 14.5.0)
68 - endif(APPLE)
69 - set (CVMFS_BASE_CXX_FLAGS "${CVMFS_BASE_C_FLAGS} -fno-exceptions")
70 - if (NOT USING_CLANG)
71 -@@ -94,4 +73,4 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
72 - message("Enable inotify support")
73 - set(CVMFS_ENABLE_INOTIFY ON)
74 - endif(HAS_INOTIFY_INIT1)
75 --endif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
76 -\ No newline at end of file
77 -+endif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
78 ---
79 -2.27.0
80 -