From f4b235557c41f48f3b8df4bc5b52fad67152243e Mon Sep 17 00:00:00 2001 From: Ebrahim Byagowi Date: Tue, 9 May 2017 14:26:46 +0430 Subject: [PATCH] [ragel] Update to 6.10 and unbreak build --- .../0001-Remove-unistd.h-include-1.patch | 8 +++--- .../0002-Remove-unistd.h-include-2.patch | 8 +++--- ports/ragel/0003-Fix-rsxgoto.cpp-build.patch | 25 ------------------- ports/ragel/CMakeLists.txt | 2 +- ports/ragel/CONTROL | 4 +-- ports/ragel/portfile.cmake | 18 +++---------- 6 files changed, 15 insertions(+), 50 deletions(-) delete mode 100644 ports/ragel/0003-Fix-rsxgoto.cpp-build.patch diff --git a/ports/ragel/0001-Remove-unistd.h-include-1.patch b/ports/ragel/0001-Remove-unistd.h-include-1.patch index d024401fce..2cdc39b72c 100644 --- a/ports/ragel/0001-Remove-unistd.h-include-1.patch +++ b/ports/ragel/0001-Remove-unistd.h-include-1.patch @@ -4,13 +4,13 @@ Date: Tue, 4 Oct 2016 17:54:22 +0200 Subject: [PATCH 1/2] Remove unistd.h include 1 --- - ragel-6.9/ragel/main.cpp | 1 - + ragel-6.10/ragel/main.cpp | 1 - 1 file changed, 1 deletion(-) -diff --git a/ragel-6.9/ragel/main.cpp b/ragel-6.9/ragel/main.cpp +diff --git a/ragel-6.10/ragel/main.cpp b/ragel-6.10/ragel/main.cpp index f5fbd7b..e3bcc18 100644 ---- a/ragel-6.9/ragel/main.cpp -+++ b/ragel-6.9/ragel/main.cpp +--- a/ragel-6.10/ragel/main.cpp ++++ b/ragel-6.10/ragel/main.cpp @@ -24,7 +24,6 @@ #include #include diff --git a/ports/ragel/0002-Remove-unistd.h-include-2.patch b/ports/ragel/0002-Remove-unistd.h-include-2.patch index bade778898..b2c0e497a6 100644 --- a/ports/ragel/0002-Remove-unistd.h-include-2.patch +++ b/ports/ragel/0002-Remove-unistd.h-include-2.patch @@ -4,13 +4,13 @@ Date: Tue, 4 Oct 2016 17:54:38 +0200 Subject: [PATCH 2/2] Remove unistd.h include 2 --- - ragel-6.9/ragel/main.cpp | 1 - + ragel-6.10/ragel/main.cpp | 1 - 1 file changed, 1 deletion(-) -diff --git a/ragel-6.9/ragel/main.cpp b/ragel-6.9/ragel/main.cpp +diff --git a/ragel-6.10/ragel/main.cpp b/ragel-6.10/ragel/main.cpp index e3bcc18..947b1c8 100644 ---- a/ragel-6.9/ragel/main.cpp -+++ b/ragel-6.9/ragel/main.cpp +--- a/ragel-6.10/ragel/main.cpp ++++ b/ragel-6.10/ragel/main.cpp @@ -25,7 +25,6 @@ #include #include diff --git a/ports/ragel/0003-Fix-rsxgoto.cpp-build.patch b/ports/ragel/0003-Fix-rsxgoto.cpp-build.patch deleted file mode 100644 index 3ab8857e19..0000000000 --- a/ports/ragel/0003-Fix-rsxgoto.cpp-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 852aebf39d85964141cf9243d89abc2d5ee761ce Mon Sep 17 00:00:00 2001 -From: vlj -Date: Tue, 4 Oct 2016 18:22:41 +0200 -Subject: [PATCH 3/3] Fix rsxgoto.cpp build. - ---- - ragel-6.9/ragel/rbxgoto.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ragel-6.9/ragel/rbxgoto.cpp b/ragel-6.9/ragel/rbxgoto.cpp -index c54cb00..9e33425 100644 ---- a/ragel-6.9/ragel/rbxgoto.cpp -+++ b/ragel-6.9/ragel/rbxgoto.cpp -@@ -658,7 +658,7 @@ void RbxGotoCodeGen::BREAK( ostream &ret, int targState ) - out << - " begin\n" - " " << P() << " += 1\n" -- " " << rbxGoto(ret, "_out") << "\n" -+ " "; rbxGoto(ret, "_out") << "\n" - " end\n"; - } - --- -2.8.3.windows.1 - diff --git a/ports/ragel/CMakeLists.txt b/ports/ragel/CMakeLists.txt index 5c161194c2..2f5d1dc000 100644 --- a/ports/ragel/CMakeLists.txt +++ b/ports/ragel/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -project(ragel CXX) +project(ragel) file(GLOB HEADERS ragel/buffer.h diff --git a/ports/ragel/CONTROL b/ports/ragel/CONTROL index 78aaf1679b..bb83fa72f6 100644 --- a/ports/ragel/CONTROL +++ b/ports/ragel/CONTROL @@ -1,3 +1,3 @@ Source: ragel -Version: 6.9 -Description:Ragel State Machine Compiler +Version: 6.10 +Description: Ragel State Machine Compiler diff --git a/ports/ragel/portfile.cmake b/ports/ragel/portfile.cmake index c240fdefdc..bad1efaafa 100644 --- a/ports/ragel/portfile.cmake +++ b/ports/ragel/portfile.cmake @@ -1,17 +1,9 @@ -# Common Ambient Variables: -# VCPKG_ROOT_DIR = -# TARGET_TRIPLET is the current triplet (x86-windows, etc) -# PORT is the current port name (zlib, etc) -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# - include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ragel-6.9) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ragel-6.10) vcpkg_download_distfile(ARCHIVE - URLS "http://www.colm.net/files/ragel/ragel-6.9.tar.gz" - FILENAME "ragel-6.9.tar.gz" - SHA512 46886a37fa0b785574c03ba6581d99bbeaa11ca65cf4fdc37ceef42f4869bd695694cd69b4b974a25cf539f004cb106e3debda17fc26e1a9a6a4295992733dbd + URLS "http://www.colm.net/files/ragel/ragel-6.10.tar.gz" + FILENAME "ragel-6.10.tar.gz" + SHA512 6c1fe4f6fa8546ae28b92ccfbae94355ff0d3cea346b9ae8ce4cf6c2bdbeb823e0ccd355332643ea72d3befd533a8b3030ddbf82be7ffa811c2c58cbb01aaa38 ) vcpkg_extract_source_archive(${ARCHIVE}) @@ -23,12 +15,10 @@ vcpkg_apply_patches( PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Remove-unistd.h-include-1.patch" "${CMAKE_CURRENT_LIST_DIR}/0002-Remove-unistd.h-include-2.patch" - "${CMAKE_CURRENT_LIST_DIR}/0003-Fix-rsxgoto.cpp-build.patch" ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - GENERATOR "Visual Studio 14 2015" ) vcpkg_install_cmake()