aboutsummaryrefslogtreecommitdiff
path: root/ports/fmilib
diff options
context:
space:
mode:
authornicole mazzuca <mazzucan@outlook.com>2020-09-24 15:15:06 -0700
committerGitHub <noreply@github.com>2020-09-24 15:15:06 -0700
commit4cbbcbddfd42d94d6d8ee6c8b6ad00ef6a0927d3 (patch)
tree371509cc59c45895c85e5e049aaa2cd9c39cc7b0 /ports/fmilib
parentc1acea1f044d3300b0c3791c2ce74d53e5a15548 (diff)
downloadvcpkg-4cbbcbddfd42d94d6d8ee6c8b6ad00ef6a0927d3.tar.gz
vcpkg-4cbbcbddfd42d94d6d8ee6c8b6ad00ef6a0927d3.zip
[vcpkg macos ci] Switch to using our own base boxes, to fix bringing up mac machines (#13619)
* [vcpkg ci:osx] Remove brew install * add instructions for creating a new vagrant box * fix the vagrant scripts for the new box * finish fixing the setup * [mecab jxrlib] fix ports for CI mecab needed to use an actual ref that wasn't master, and jxrlib needed a patch for xcode 12 CLTs. Additionally, this fixes the mecab version to be a date, the date of the last commit, since `1.0` is not the correct version (mecab doesn't have released versions) * [many ports] fix compile with Xcode 12 CLTs This mostly means fixing errors on implicit-function-declaration, and removing some Werrors * alac-decoder * apr * argtable2 * arrow * hyperscan * mcpp * minizip * mosquitto * stormlib * [many ports] even more Xcode 12 CLT fixes * [jxrlib darknet] fix the last ports! (hopefully) * CRs, plus minor wip changes to osx scripts
Diffstat (limited to 'ports/fmilib')
-rw-r--r--ports/fmilib/0001-remove-install-prefix.patch12
-rw-r--r--ports/fmilib/0002-include-sys-stat.h-for-mkdir.patch20
-rw-r--r--ports/fmilib/CONTROL3
-rw-r--r--ports/fmilib/portfile.cmake1
4 files changed, 35 insertions, 1 deletions
diff --git a/ports/fmilib/0001-remove-install-prefix.patch b/ports/fmilib/0001-remove-install-prefix.patch
index b54c903d7..42ba75701 100644
--- a/ports/fmilib/0001-remove-install-prefix.patch
+++ b/ports/fmilib/0001-remove-install-prefix.patch
@@ -1,3 +1,12 @@
+From 04bb359c724308e30268840c64932ea1d05b9077 Mon Sep 17 00:00:00 2001
+From: Nicole Mazzuca <mazzucan@outlook.com>
+Date: Wed, 23 Sep 2020 10:00:23 -0700
+Subject: [PATCH 1/2] remove install prefix
+
+---
+ CMakeLists.txt | 4 ----
+ 1 file changed, 4 deletions(-)
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7372bf..f3c11f1 100644
--- a/CMakeLists.txt
@@ -34,3 +43,6 @@ index f7372bf..f3c11f1 100644
set(DOXYFILE_STRIP_FROM_PATH "${FMILIBRARYHOME}")
+--
+2.24.3 (Apple Git-128)
+
diff --git a/ports/fmilib/0002-include-sys-stat.h-for-mkdir.patch b/ports/fmilib/0002-include-sys-stat.h-for-mkdir.patch
new file mode 100644
index 000000000..a39617e47
--- /dev/null
+++ b/ports/fmilib/0002-include-sys-stat.h-for-mkdir.patch
@@ -0,0 +1,20 @@
+From 080876bf3735efeedaab0b211d2be7b3c3524d97 Mon Sep 17 00:00:00 2001
+From: Nicole Mazzuca <mazzucan@outlook.com>
+Date: Wed, 23 Sep 2020 10:03:30 -0700
+Subject: [PATCH 2/2] include sys/stat.h for mkdir
+
+---
+ ThirdParty/Minizip/minizip/miniunz.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/ThirdParty/Minizip/minizip/miniunz.c b/ThirdParty/Minizip/minizip/miniunz.c
+index 2264705..e0167d5 100644
+--- a/ThirdParty/Minizip/minizip/miniunz.c
++++ b/ThirdParty/Minizip/minizip/miniunz.c
+@@ -53,5 +53,6 @@
+ #else
+ # include <unistd.h>
+ # include <utime.h>
++# include <sys/stat.h>
+ #endif
+
diff --git a/ports/fmilib/CONTROL b/ports/fmilib/CONTROL
index 4a837377d..b5a0517c3 100644
--- a/ports/fmilib/CONTROL
+++ b/ports/fmilib/CONTROL
@@ -1,4 +1,5 @@
Source: fmilib
-Version: 2.0.3-2
+Version: 2.0.3
+Port-Version: 3
Description: FMI library is intended as a foundation for applications interfacing FMUs (Functional Mockup Units) that follow FMI Standard. This version of the library supports FMI 1.0 and FMI2.0.
Homepage: https://www.fmi-standard.org/
diff --git a/ports/fmilib/portfile.cmake b/ports/fmilib/portfile.cmake
index 39b0e0377..0f3a4f290 100644
--- a/ports/fmilib/portfile.cmake
+++ b/ports/fmilib/portfile.cmake
@@ -13,6 +13,7 @@ vcpkg_extract_source_archive_ex(
ARCHIVE ${ARCHIVE}
PATCHES
0001-remove-install-prefix.patch
+ 0002-include-sys-stat.h-for-mkdir.patch
)
# Note that if you have configured and built both static and shared library on Windows