[gentoo-commits] repo/gentoo:master commit in: net-fs/cvmfs/files/

[gentoo-commits] repo/gentoo:master commit in: net-fs/cvmfs/files/

[Guilherme Amadio]

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
-

[gentoo-commits] repo/gentoo:master commit in: net-fs/cvmfs/files/

[Conrad Kostecki]

commit:     8debad39211c825bd1169297c388c80768570a94
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Oct  4 10:41:39 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 19:33:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8debad39

net-fs/cvmfs: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27610
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-fs/cvmfs/files/cvmfs-2.7.2-xattr.patch | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/net-fs/cvmfs/files/cvmfs-2.7.2-xattr.patch b/net-fs/cvmfs/files/cvmfs-2.7.2-xattr.patch
deleted file mode 100644
index e10557923ced..000000000000
--- a/net-fs/cvmfs/files/cvmfs-2.7.2-xattr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 44cae128f7478ab81be92cdfc7dec6c2aee26e42 Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <guilherme@amadio.org>
-Date: Mon, 6 Apr 2020 17:17:30 +0200
-Subject: [PATCH 1/3] Do not include deprecated attr/xattr.h
-
----
- cvmfs/platform_linux.h | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/cvmfs/platform_linux.h b/cvmfs/platform_linux.h
-index 21e7d81fb..9aa0c9051 100644
---- a/cvmfs/platform_linux.h
-+++ b/cvmfs/platform_linux.h
-@@ -9,9 +9,6 @@
- 
- #include <sys/types.h>  // contains ssize_t needed inside <attr/xattr.h>
- #include <sys/xattr.h>
--#ifdef HAVE_ATTR_XATTR_H
--#include <attr/xattr.h>  // NOLINT(build/include_alpha)
--#endif
- #include <dirent.h>
- #include <errno.h>
- #include <fcntl.h>
--- 
-2.26.0
-