CVS commit: pkgsrc/textproc/libclucene

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Fri Apr 16 14:55:42 UTC 2021

Modified Files:
        pkgsrc/textproc/libclucene: distinfo
        pkgsrc/textproc/libclucene/patches:
            patch-src_shared_cmake_MacroCheckGccVisibility.cmake

Log Message:
libclucene: Fix build with GCC 10

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


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/libclucene/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/textproc/libclucene/patches/patch-src_shared_cmake_MacroCheckGccVisibility.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/libclucene/distinfo
diff -u pkgsrc/textproc/libclucene/distinfo:1.10 pkgsrc/textproc/libclucene/distinfo:1.11
--- pkgsrc/textproc/libclucene/distinfo:1.10    Thu Feb  8 07:28:58 2018
+++ pkgsrc/textproc/libclucene/distinfo Fri Apr 16 14:55:42 2021
@@ -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
 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

Index: pkgsrc/textproc/libclucene/patches/patch-src_shared_cmake_MacroCheckGccVisibility.cmake
diff -u pkgsrc/textproc/libclucene/patches/patch-src_shared_cmake_MacroCheckGccVisibility.cmake:1.1 pkgsrc/textproc/libclucene/patches/patch-src_shared_cmake_MacroCheckGccVisibility.cmake:1.2
--- pkgsrc/textproc/libclucene/patches/patch-src_shared_cmake_MacroCheckGccVisibility.cmake:1.1 Thu Feb  8 07:28:58 2018
+++ pkgsrc/textproc/libclucene/patches/patch-src_shared_cmake_MacroCheckGccVisibility.cmake     Fri Apr 16 14:55:42 2021
@@ -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 @@ also look for GCC 6, 7, 8 and 9.
     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)