public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Guilherme Amadio" <amadio@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/cvmfs/files/
Date: Mon, 28 Jun 2021 19:42:48 +0000 (UTC)	[thread overview]
Message-ID: <1624909037.06a2a4dc6eac81683c0221b0e47ac3a23f9c84ff.amadio@gentoo> (raw)

commit:     06a2a4dc6eac81683c0221b0e47ac3a23f9c84ff
Author:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 28 19:37:17 2021 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Jun 28 19:37:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a2a4dc

net-fs/cvmfs: remove unused patch

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>

 net-fs/cvmfs/files/cvmfs-2.7.2-gcc-version.patch | 59 ------------------------
 1 file changed, 59 deletions(-)

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
deleted file mode 100644
index ff76b574670..00000000000
--- a/net-fs/cvmfs/files/cvmfs-2.7.2-gcc-version.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From cdeb988a7ece84191ec3496d55b99d82ca9face5 Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <amadio@cern.ch>
-Date: Fri, 19 Jun 2020 11:19:14 +0200
-Subject: [PATCH] Remove broken version checks which fail for GCC 10
-
----
- cmake/Modules/cvmfs_compiler.cmake | 27 +++------------------------
- 1 file changed, 3 insertions(+), 24 deletions(-)
-
-diff --git a/cmake/Modules/cvmfs_compiler.cmake b/cmake/Modules/cvmfs_compiler.cmake
-index 2560d231c..e473467b3 100644
---- a/cmake/Modules/cvmfs_compiler.cmake
-+++ b/cmake/Modules/cvmfs_compiler.cmake
-@@ -35,33 +35,12 @@ set (ENV{LDFLAGS}    "${LDFLAGS}")
- #
- set (CVMFS_FIX_FLAGS "")
- set (CVMFS_OPT_FLAGS "-Os")
--if (CMAKE_COMPILER_IS_GNUCC)
--  message (STATUS "checking gcc version...")
--  execute_process (
--    COMMAND ${CMAKE_C_COMPILER} -v
--    OUTPUT_VARIABLE CVMFS_GCC_VERSION
--    ERROR_VARIABLE  CVMFS_GCC_VERSION
--  )
--  STRING(REGEX REPLACE ".*([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" CVMFS_GCC_MAJOR "${CVMFS_GCC_VERSION}")
--  STRING(REGEX REPLACE ".*[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" CVMFS_GCC_MINOR "${CVMFS_GCC_VERSION}")
--  if (${CVMFS_GCC_MAJOR} LESS 4)
--    message (FATAL_ERROR "GCC < 4.1 unsupported")
--  endif (${CVMFS_GCC_MAJOR} LESS 4)
--  if (${CVMFS_GCC_MAJOR} EQUAL 4)
--    if (${CVMFS_GCC_MINOR} LESS 2)
--      set (CVMFS_OPT_FLAGS "-O1")
--    endif (${CVMFS_GCC_MINOR} LESS 2)
--  endif (${CVMFS_GCC_MAJOR} EQUAL 4)
--  if (${CVMFS_GCC_MAJOR} GREATER 6)
--    set (CVMFS_FIX_FLAGS "-Wno-format-truncation")
--  endif (${CVMFS_GCC_MAJOR} GREATER 6)
--endif (CMAKE_COMPILER_IS_GNUCC)
- message (STATUS "using compiler opt flag ${CVMFS_OPT_FLAGS}")
- 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}")
- if (APPLE)
--  if (${CMAKE_SYSTEM_VERSION} GREATER 14.5.0)
-+  if (${CMAKE_SYSTEM_VERSION} VERSION_GREATER 14.5.0)
-     set(CVMFS_BASE_C_FLAGS "${CVMFS_BASE_C_FLAGS} -mmacosx-version-min=10.11")
--  endif(${CMAKE_SYSTEM_VERSION} GREATER 14.5.0)
-+  endif(${CMAKE_SYSTEM_VERSION} VERSION_GREATER 14.5.0)
- endif(APPLE)
- set (CVMFS_BASE_CXX_FLAGS "${CVMFS_BASE_C_FLAGS} -fno-exceptions")
- if (NOT USING_CLANG)
-@@ -94,4 +73,4 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-     message("Enable inotify support")
-     set(CVMFS_ENABLE_INOTIFY ON)
-   endif(HAS_INOTIFY_INIT1)
--endif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-\ No newline at end of file
-+endif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
--- 
-2.27.0
-


             reply	other threads:[~2021-06-28 19:42 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-28 19:42 Guilherme Amadio [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-10-15 19:34 [gentoo-commits] repo/gentoo:master commit in: net-fs/cvmfs/files/ Conrad Kostecki

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=1624909037.06a2a4dc6eac81683c0221b0e47ac3a23f9c84ff.amadio@gentoo \
    --to=amadio@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