mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-17 19:13:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

dev-util/afdko: use system antlr4

Browse Source 
Closes: https://bugs.gentoo.org/838802
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
This commit is contained in:
Alessandro Barbieri
2022-04-16 18:19:00 +02:00
parent 47cf61d513
commit acbf936b77
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
dev-util/afdko/files/afdko-3.8.1-antlr.patch Normal file
View File

@@ -0,0 +1,41 @@
diff '--color=auto' -ru afdko-3.8.1-orig/c/makeotf/lib/hotconv/CMakeLists.txt afdko-3.8.1/c/makeotf/lib/hotconv/CMakeLists.txt
--- a/c/makeotf/lib/hotconv/CMakeLists.txt 2022-04-16 18:04:34.060438876 +0200
+++ b/c/makeotf/lib/hotconv/CMakeLists.txt 2022-04-16 18:11:51.280732567 +0200
@@ -68,8 +68,8 @@
)
set_property(TARGET hotconv PROPERTY C_STANDARD 99)
-target_include_directories(hotconv PRIVATE AFTER $<$<COMPILE_LANGUAGE:CXX>:${ANTLR4_INCLUDE_DIRS}>)
-target_link_libraries(hotconv PUBLIC antlr4_static)
+target_include_directories(hotconv PUBLIC /usr/include/antlr4-runtime)
+target_link_libraries(hotconv PUBLIC -lantlr4-runtime)
if ( CMAKE_COMPILER_IS_GNUCC )
target_compile_options(hotconv PRIVATE -Wall -Wno-attributes)
diff '--color=auto' -ru afdko-3.8.1-orig/CMakeLists.txt afdko-3.8.1/CMakeLists.txt
--- a/CMakeLists.txt 2022-04-16 18:04:34.055438815 +0200
+++ b/CMakeLists.txt 2022-04-16 18:05:14.656930402 +0200
@@ -27,23 +27,6 @@
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-# Antlr 4 configuration
-
-# This is an alternate way of supplying the Antlr 4 sources that will override
-# the git clone of the tag listed below. This is especially useful if you
-# encounter compiler problems and need to make small edits to compensate. Start
-# with the Antlr project's sources, e.g.
-# https://www.antlr.org/download/antlr4-cpp-runtime-4.9.2-source.zip
-# set(ANTLR4_ZIP_REPOSITORY "/path_to_antlr4_archive/a4.zip")
-
-add_definitions(-DANTLR4CPP_STATIC)
-set(ANTLR4_WITH_STATIC_CRT OFF)
-# Use slightly more recent commit than 4.9.2 to deal with utfcpp test
-# compilation problems
-# set(ANTLR4_TAG tags/4.9.2)
-set(ANTLR4_TAG 916f03366edf15bf8b50010b11d479c189bf9f96)
-include(ExternalAntlr4Cpp)
-
# sanitizer support
# work around https://github.com/pypa/setuptools/issues/1928 with environment
# variable