pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/libclucene libclucene: Fix build with GCC 10



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bc6fe0cc5efd
branches:  trunk
changeset: 450440:bc6fe0cc5efd
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Fri Apr 16 14:55:42 2021 +0000

description:
libclucene: Fix build with GCC 10

* Match all GCC versions, ignore GCC 2 or earlier cases.
  Fix build with GCC 10 or later.

diffstat:

 textproc/libclucene/distinfo                                                     |  4 ++--
 textproc/libclucene/patches/patch-src_shared_cmake_MacroCheckGccVisibility.cmake |  7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r 8b4e954d833e -r bc6fe0cc5efd textproc/libclucene/distinfo
--- a/textproc/libclucene/distinfo      Fri Apr 16 14:29:43 2021 +0000
+++ b/textproc/libclucene/distinfo      Fri Apr 16 14:55:42 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2018/02/08 07:28:58 mrg Exp $
+$NetBSD: distinfo,v 1.11 2021/04/16 14:55:42 ryoon Exp $
 
 SHA1 (clucene-core-2.3.3.4.tar.gz) = 76d6788e747e78abb5abf8eaad78d3342da5f2a4
 RMD160 (clucene-core-2.3.3.4.tar.gz) = 5acfc9c8acd167b3684cfc731a60fd9c5465cc9b
@@ -12,4 +12,4 @@
 SHA1 (patch-src_core_CLucene_queryParser_QueryParserTokenManager.h) = 6934ad5e1052850b2aed50d91260bd46801e6274
 SHA1 (patch-src_shared_CLucene_LuceneThreads.h) = a08f4ccc70150510650ba82c64b1dff8495b1f10
 SHA1 (patch-src_shared_CLucene_config_repl__tchar.h) = 465537d5ee226d9831df2da8d87f3dbc5e364d5f
-SHA1 (patch-src_shared_cmake_MacroCheckGccVisibility.cmake) = 90aaa4649ed167afb3a556dbf251f2205e1c348a
+SHA1 (patch-src_shared_cmake_MacroCheckGccVisibility.cmake) = e78152256779e07236b9aabdc68ee9e64122ab0a
diff -r 8b4e954d833e -r bc6fe0cc5efd textproc/libclucene/patches/patch-src_shared_cmake_MacroCheckGccVisibility.cmake
--- a/textproc/libclucene/patches/patch-src_shared_cmake_MacroCheckGccVisibility.cmake  Fri Apr 16 14:29:43 2021 +0000
+++ b/textproc/libclucene/patches/patch-src_shared_cmake_MacroCheckGccVisibility.cmake  Fri Apr 16 14:55:42 2021 +0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_shared_cmake_MacroCheckGccVisibility.cmake,v 1.1 2018/02/08 07:28:58 mrg Exp $
+$NetBSD: patch-src_shared_cmake_MacroCheckGccVisibility.cmake,v 1.2 2021/04/16 14:55:42 ryoon Exp $
 
-also look for GCC 6, 7, 8 and 9.
+* Match all GCC versions, ignore GCC 2 or earlier cases.
+  Fix build with GCC 10 or later.
 
 --- src/shared/cmake/MacroCheckGccVisibility.cmake.orig        2011-03-17 00:21:07.000000000 +0000
 +++ src/shared/cmake/MacroCheckGccVisibility.cmake     2018-02-08 06:10:02.136958010 +0000
@@ -9,7 +10,7 @@
     exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
  
 -   string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
-+   string (REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
++   string (REGEX MATCH "[0-9]+\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
     if (NOT _gcc_version)
     
        # clang reports: clang version 1.1 (trunk 95754)



Home | Main Index | Thread Index | Old Index