diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-09-24 15:15:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-24 15:15:06 -0700 |
| commit | 4cbbcbddfd42d94d6d8ee6c8b6ad00ef6a0927d3 (patch) | |
| tree | 371509cc59c45895c85e5e049aaa2cd9c39cc7b0 /ports/mcpp | |
| parent | c1acea1f044d3300b0c3791c2ce74d53e5a15548 (diff) | |
| download | vcpkg-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/mcpp')
| -rw-r--r-- | ports/mcpp/0001-fix-_POSIX_C_SOURCE.patch | 38 | ||||
| -rw-r--r-- | ports/mcpp/CONTROL | 3 | ||||
| -rw-r--r-- | ports/mcpp/portfile.cmake | 2 |
3 files changed, 42 insertions, 1 deletions
diff --git a/ports/mcpp/0001-fix-_POSIX_C_SOURCE.patch b/ports/mcpp/0001-fix-_POSIX_C_SOURCE.patch new file mode 100644 index 000000000..37f625ba5 --- /dev/null +++ b/ports/mcpp/0001-fix-_POSIX_C_SOURCE.patch @@ -0,0 +1,38 @@ +From d2625f80e08ff811a173ca3dbe76a0e004c26c65 Mon Sep 17 00:00:00 2001 +From: Nicole Mazzuca <mazzucan@outlook.com> +Date: Tue, 22 Sep 2020 16:21:43 -0700 +Subject: [PATCH] fix _POSIX_C_SOURCE + +set it to correctly ask for 200112L, for readlink +--- + configed.H | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/configed.H b/configed.H +index 2e01c15..250f441 100644 +--- a/configed.H ++++ b/configed.H +@@ -189,19 +189,13 @@ + #define _POSIX_ 1 + #define _POSIX_SOURCE 1 + #ifndef _POSIX_C_SOURCE +-#define _POSIX_C_SOURCE 1 ++#define _POSIX_C_SOURCE 200112L + #define _POSIX_C_SOURCE_defined 1 + #endif + #include "limits.h" + #ifdef _AIX + #include "sys/stat.h" + #endif +-#undef _POSIX_ +-#undef _POSIX_SOURCE +-#ifdef _POSIX_C_SOURCE_defined +-#undef _POSIX_C_SOURCE +-#undef _POSIX_C_SOURCE_defined +-#endif + #define CHARBIT CHAR_BIT + #define UCHARMAX UCHAR_MAX + #define USHRTMAX USHRT_MAX +-- +2.24.3 (Apple Git-128) + diff --git a/ports/mcpp/CONTROL b/ports/mcpp/CONTROL index cc756ae9a..dc607aeb0 100644 --- a/ports/mcpp/CONTROL +++ b/ports/mcpp/CONTROL @@ -1,4 +1,5 @@ Source: mcpp
-Version: 2.7.2.14-1
+Version: 2.7.2.14
+Port-Version: 2
Homepage: https://github.com/zeroc-ice/mcpp
Description: Fork of mcpp, a C/C++ preprocessor
diff --git a/ports/mcpp/portfile.cmake b/ports/mcpp/portfile.cmake index 11e268f99..8e2928ea1 100644 --- a/ports/mcpp/portfile.cmake +++ b/ports/mcpp/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF e6abf9a561294b667bb931b80cf749c9be2d1a2f
SHA512 131b68401683bcfb947ac4969a59aa4c1683412c30f76c50e9e9c5c952a881b9950127db2ef22c96968d8c90d26bcdb5a90fb1b77d4dda7dee67bfe4a2676b35
HEAD_REF master
+ PATCHES
+ 0001-fix-_POSIX_C_SOURCE.patch
)
vcpkg_configure_cmake(
|