aboutsummaryrefslogtreecommitdiff
path: root/ports/ragel
diff options
context:
space:
mode:
authorStefano Sinigardi <stesinigardi@hotmail.com>2019-10-07 19:35:13 +0200
committerCurtis J Bezault <curtbezault@gmail.com>2019-10-07 10:35:13 -0700
commit726c11148105a97aef39bec024fdb7c140b1b154 (patch)
tree26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/ragel
parente86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff)
downloadvcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz
vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/ragel')
-rw-r--r--ports/ragel/0001-Remove-unistd.h-include-1.patch24
-rw-r--r--ports/ragel/0001-remove-unistd-h.patch14
-rw-r--r--ports/ragel/0002-Remove-unistd.h-include-2.patch24
-rw-r--r--ports/ragel/CONTROL2
-rw-r--r--ports/ragel/portfile.cmake17
5 files changed, 23 insertions, 58 deletions
diff --git a/ports/ragel/0001-Remove-unistd.h-include-1.patch b/ports/ragel/0001-Remove-unistd.h-include-1.patch
deleted file mode 100644
index 2cdc39b72..000000000
--- a/ports/ragel/0001-Remove-unistd.h-include-1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4a337ce9475c75497f4221cadd9d2dd8126835c7 Mon Sep 17 00:00:00 2001
-From: vlj <vljn.ovi@gmail.com>
-Date: Tue, 4 Oct 2016 17:54:22 +0200
-Subject: [PATCH 1/2] Remove unistd.h include 1
-
----
- ragel-6.10/ragel/main.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/ragel-6.10/ragel/main.cpp b/ragel-6.10/ragel/main.cpp
-index f5fbd7b..e3bcc18 100644
---- a/ragel-6.10/ragel/main.cpp
-+++ b/ragel-6.10/ragel/main.cpp
-@@ -24,7 +24,6 @@
- #include <stdio.h>
- #include <iostream>
- #include <fstream>
--#include <unistd.h>
- #include <sstream>
- #include <unistd.h>
- #include <sys/types.h>
---
-2.10.0.windows.1
-
diff --git a/ports/ragel/0001-remove-unistd-h.patch b/ports/ragel/0001-remove-unistd-h.patch
new file mode 100644
index 000000000..fba598e0c
--- /dev/null
+++ b/ports/ragel/0001-remove-unistd-h.patch
@@ -0,0 +1,14 @@
+diff --git a/ragel/main.cpp b/ragel/main.cpp
+index f5fbd7b..947b1c8 100644
+--- a/ragel/main.cpp
++++ b/ragel/main.cpp
+@@ -24,9 +24,7 @@
+ #include <stdio.h>
+ #include <iostream>
+ #include <fstream>
+-#include <unistd.h>
+ #include <sstream>
+-#include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
diff --git a/ports/ragel/0002-Remove-unistd.h-include-2.patch b/ports/ragel/0002-Remove-unistd.h-include-2.patch
deleted file mode 100644
index b2c0e497a..000000000
--- a/ports/ragel/0002-Remove-unistd.h-include-2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 259bb8be3f66e32063652cb4f1a456b7327ca513 Mon Sep 17 00:00:00 2001
-From: vlj <vljn.ovi@gmail.com>
-Date: Tue, 4 Oct 2016 17:54:38 +0200
-Subject: [PATCH 2/2] Remove unistd.h include 2
-
----
- ragel-6.10/ragel/main.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/ragel-6.10/ragel/main.cpp b/ragel-6.10/ragel/main.cpp
-index e3bcc18..947b1c8 100644
---- a/ragel-6.10/ragel/main.cpp
-+++ b/ragel-6.10/ragel/main.cpp
-@@ -25,7 +25,6 @@
- #include <iostream>
- #include <fstream>
- #include <sstream>
--#include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
---
-2.10.0.windows.1
-
diff --git a/ports/ragel/CONTROL b/ports/ragel/CONTROL
index 1e23db117..abec9f49a 100644
--- a/ports/ragel/CONTROL
+++ b/ports/ragel/CONTROL
@@ -1,4 +1,4 @@
Source: ragel
-Version: 6.10-2
+Version: 6.10-3
Homepage: https://www.colm.net/files/ragel
Description: Ragel State Machine Compiler
diff --git a/ports/ragel/portfile.cmake b/ports/ragel/portfile.cmake
index 820ded5df..037f34289 100644
--- a/ports/ragel/portfile.cmake
+++ b/ports/ragel/portfile.cmake
@@ -1,22 +1,21 @@
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ragel-6.10)
+
vcpkg_download_distfile(ARCHIVE
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})
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH}/ragel)
-vcpkg_apply_patches(
- SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src
+vcpkg_extract_source_archive_ex(
+ OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${ARCHIVE}
PATCHES
- "${CMAKE_CURRENT_LIST_DIR}/0001-Remove-unistd.h-include-1.patch"
- "${CMAKE_CURRENT_LIST_DIR}/0002-Remove-unistd.h-include-2.patch"
+ 0001-remove-unistd-h.patch
)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH}/ragel)
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA