kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

copy libclucene patch for MacroCheckGccVisibility.cmake to make

Browse source 
this work for future GCC too.
This commit is contained in:
mrg 2021-04-18 20:34:04 +00:00
parent b2de7fb4b5
commit 92ea8d27fa
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sysutils/strigi/distinfo
View file

@ -1,11 +1,11 @@
$NetBSD: distinfo,v 1.12 2018/02/08 07:28:58 mrg Exp $ $NetBSD: distinfo,v 1.13 2021/04/18 20:34:04 mrg Exp $
SHA1 (strigi-0.7.8.tar.bz2) = 7250fb15109d33b0c49995a2cc3513ba7d937882 SHA1 (strigi-0.7.8.tar.bz2) = 7250fb15109d33b0c49995a2cc3513ba7d937882
RMD160 (strigi-0.7.8.tar.bz2) = 34cbbe98e7a371467b115b18586baf299340d1b8 RMD160 (strigi-0.7.8.tar.bz2) = 34cbbe98e7a371467b115b18586baf299340d1b8
SHA512 (strigi-0.7.8.tar.bz2) = 536f5bd5ed13d87d30c2fa31b6dcb2a883df173e5d60deefe0fdeb843f40f29f7edd0041029dc013bb31a205572087ed95ca661bcdf6d989d9806931716b1043 SHA512 (strigi-0.7.8.tar.bz2) = 536f5bd5ed13d87d30c2fa31b6dcb2a883df173e5d60deefe0fdeb843f40f29f7edd0041029dc013bb31a205572087ed95ca661bcdf6d989d9806931716b1043
Size (strigi-0.7.8.tar.bz2) = 810574 bytes Size (strigi-0.7.8.tar.bz2) = 810574 bytes
SHA1 (patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake) = e3489b44e6676ec9a551867a955588500d78ae53 SHA1 (patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake) = 7d8371711bc9c5465f87b9e7e649b45de3652bb2
SHA1 (patch-libstreamanalyzer_plugins_indexers_clucenengindexer_cluceneindexreader.cpp) = a5882febfd31a391f4efaa37a8786e1f7ddd0a7a SHA1 (patch-libstreamanalyzer_plugins_indexers_clucenengindexer_cluceneindexreader.cpp) = a5882febfd31a391f4efaa37a8786e1f7ddd0a7a
SHA1 (patch-libstreams_CMakeLists.txt) = ce25d12f5c20f7f0be659bdccc24e8b4a898274a SHA1 (patch-libstreams_CMakeLists.txt) = ce25d12f5c20f7f0be659bdccc24e8b4a898274a
SHA1 (patch-libstreams_cmake_MacroCheckGccVisibility.cmake) = f5c214d9800b7caa3b2e7e3e1bb20e5aafd3c884 SHA1 (patch-libstreams_cmake_MacroCheckGccVisibility.cmake) = dd7aad3dba7f5139f2b1ed5fa5978f79be7b449f
SHA1 (patch-strigidaemon_bin_daemon_xesam_xesamsearch.h) = 70d251880f08f279f53a3ed31281452c6d25811d SHA1 (patch-strigidaemon_bin_daemon_xesam_xesamsearch.h) = 70d251880f08f279f53a3ed31281452c6d25811d

6
sysutils/strigi/patches/patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake
View file

@ -1,6 +1,6 @@
$NetBSD: patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake,v 1.2 2018/02/08 07:28:58 mrg Exp $ $NetBSD: patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake,v 1.3 2021/04/18 20:34:04 mrg Exp $
Support gcc6/7/8/9 * Match all GCC versions. Fix build with GCC 10 or later.
--- libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake.orig 2013-02-05 21:34:52.000000000 +0000 --- libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake.orig 2013-02-05 21:34:52.000000000 +0000
+++ libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake +++ libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake
@ -9,7 +9,7 @@ Support gcc6/7/8/9
exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info) exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info)
- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_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}")
# gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here: # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here:
if (NOT _gcc_version) if (NOT _gcc_version)
string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}") string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}")

6
sysutils/strigi/patches/patch-libstreams_cmake_MacroCheckGccVisibility.cmake
View file

@ -1,6 +1,6 @@
$NetBSD: patch-libstreams_cmake_MacroCheckGccVisibility.cmake,v 1.1 2018/02/08 07:28:58 mrg Exp $ $NetBSD: patch-libstreams_cmake_MacroCheckGccVisibility.cmake,v 1.2 2021/04/18 20:34:04 mrg Exp $
support netbsd 6, 7, 8, and 9. * Match all GCC versions. Fix build with GCC 10 or later.
--- libstreams/cmake/MacroCheckGccVisibility.cmake.orig 2013-02-05 13:34:57.000000000 -0800 --- libstreams/cmake/MacroCheckGccVisibility.cmake.orig 2013-02-05 13:34:57.000000000 -0800
+++ libstreams/cmake/MacroCheckGccVisibility.cmake 2018-02-07 22:38:19.000000000 -0800 +++ libstreams/cmake/MacroCheckGccVisibility.cmake 2018-02-07 22:38:19.000000000 -0800
@ -9,7 +9,7 @@ support netbsd 6, 7, 8, and 9.
exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info) exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info)
- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_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}")
# gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here: # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here:
if (NOT _gcc_version) if (NOT _gcc_version)
string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}") string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}")