diff options
author | Carsten Teibes | 2018-11-22 19:40:00 +0100 |
---|---|---|
committer | Carsten Teibes | 2018-11-22 19:40:00 +0100 |
commit | 3d1b197b2d7ec931252545c9b615d1f40654f8a0 (patch) | |
tree | 9bff33178a82eb774e718f5a7fa868920c38bd15 /libnpa-fix-flex-function-prototype.patch | |
parent | 31059b51bc58101d95ea5537e92a37119549f4ec (diff) | |
download | aur-libnpa.tar.gz |
[upd] 0.5.1→0.5.3
Remove patch, has been incorporated upstream.
Diffstat (limited to 'libnpa-fix-flex-function-prototype.patch')
-rw-r--r-- | libnpa-fix-flex-function-prototype.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/libnpa-fix-flex-function-prototype.patch b/libnpa-fix-flex-function-prototype.patch deleted file mode 100644 index 0e7ef8e07d09..000000000000 --- a/libnpa-fix-flex-function-prototype.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 3b3dfe69b694b6a8b67c53f87d605a6414fb0379 Mon Sep 17 00:00:00 2001 -From: Carsten Teibes <dev@f4ke.de> -Date: Mon, 21 Nov 2016 01:13:22 +0100 -Subject: [PATCH] Fix flex function prototype for flex >= 2.6.1 Add explicit - flex/bison dependency for CMake - ---- - CMakeLists.txt | 5 +++-- - include/flex.hpp | 5 ++--- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e3f10a1..5d5abe3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -59,6 +59,7 @@ endif() - - flex_target(lexer ${CMAKE_SOURCE_DIR}/src/lexer.l ${CMAKE_SOURCE_DIR}/src/lexer.cpp) - bison_target(parser ${CMAKE_SOURCE_DIR}/src/parser.y ${CMAKE_SOURCE_DIR}/src/parser.cpp) -+add_flex_bison_dependency(lexer parser) - - add_library(npa SHARED - src/inpafile.cpp -@@ -73,8 +74,8 @@ add_library(npa SHARED - src/npakeys.cpp - src/buffer.cpp - src/nsscompiler.cpp -- src/parser.cpp -- src/lexer.cpp -+ ${BISON_parser_OUTPUTS} -+ ${FLEX_lexer_OUTPUTS} - src/nsbconstants.cpp - ) - target_link_libraries(npa ${Boost_LIBRARIES} ${ZLIB_LIBRARIES}) -diff --git a/include/flex.hpp b/include/flex.hpp -index 6bce9bd..962fc25 100644 ---- a/include/flex.hpp -+++ b/include/flex.hpp -@@ -3,9 +3,8 @@ - - typedef struct yy_buffer_state* YY_BUFFER_STATE; - extern int yyparse(); --#if ((FLEX_VERSION_MAJOR) > 2 || \ -- ((FLEX_VERSION_MAJOR == 2 && FLEX_VERSION_MINOR > 5) || \ -- ((FLEX_VERSION_MAJOR == 2 && FLEX_VERSION_MINOR == 5 && FLEX_VERSION_PATCH > 35)))) -+#if ((FLEX_VERSION_MAJOR == 2 && FLEX_VERSION_MINOR == 6 && FLEX_VERSION_PATCH == 0) || \ -+ (FLEX_VERSION_MAJOR == 2 && FLEX_VERSION_MINOR == 5 && FLEX_VERSION_PATCH > 35)) - extern YY_BUFFER_STATE yy_scan_bytes(const char* bytes, size_t len); - #else - extern YY_BUFFER_STATE yy_scan_bytes(const char* bytes, int len); --- -2.10.2 - |