aboutsummaryrefslogtreecommitdiff
path: root/ports/argtable2
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/argtable2
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/argtable2')
-rw-r--r--ports/argtable2/0001-fix-install-dirs.patch (renamed from ports/argtable2/fix-install-dirs.patch)23
-rw-r--r--ports/argtable2/0002-include-correct-headers.patch60
-rw-r--r--ports/argtable2/CONTROL3
-rw-r--r--ports/argtable2/portfile.cmake4
4 files changed, 82 insertions, 8 deletions
diff --git a/ports/argtable2/fix-install-dirs.patch b/ports/argtable2/0001-fix-install-dirs.patch
index 5a9be4d72..d852ffa62 100644
--- a/ports/argtable2/fix-install-dirs.patch
+++ b/ports/argtable2/0001-fix-install-dirs.patch
@@ -1,5 +1,14 @@
+From 6594abbd953d0e26105fd6c982990eb702f27804 Mon Sep 17 00:00:00 2001
+From: Nicole Mazzuca <mazzucan@outlook.com>
+Date: Tue, 22 Sep 2020 15:22:00 -0700
+Subject: [PATCH 1/2] fix install dirs
+
+---
+ src/CMakeLists.txt | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3427487..a9b8be0 100644
+index 773c4c8..03e112c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,4 @@
@@ -15,10 +24,12 @@ index 3427487..a9b8be0 100644
-INSTALL( TARGETS argtable2 ARCHIVE DESTINATION lib)
-SET_TARGET_PROPERTIES( argtable2 PROPERTIES DEBUG_POSTFIX d )
-\ No newline at end of file
-+INSTALL(TARGETS argtable2
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++INSTALL(TARGETS argtable2
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
+INSTALL(FILES argtable2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+--
+2.24.3 (Apple Git-128)
+
diff --git a/ports/argtable2/0002-include-correct-headers.patch b/ports/argtable2/0002-include-correct-headers.patch
new file mode 100644
index 000000000..f2e4d5f5a
--- /dev/null
+++ b/ports/argtable2/0002-include-correct-headers.patch
@@ -0,0 +1,60 @@
+From 271423adb2900c8bf4aad5d73d7ef1efbb5c35d8 Mon Sep 17 00:00:00 2001
+From: Nicole Mazzuca <mazzucan@outlook.com>
+Date: Tue, 22 Sep 2020 15:17:18 -0700
+Subject: [PATCH 2/2] include correct headers
+
+---
+ src/arg_date.c | 4 +++-
+ src/arg_int.c | 1 +
+ src/getopt.c | 1 +
+ 3 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/arg_date.c b/src/arg_date.c
+index 22b59e2..5004b42 100644
+--- a/src/arg_date.c
++++ b/src/arg_date.c
+@@ -37,6 +37,8 @@ USA.
+ #include <strings.h>
+ #endif
+
++#include <string.h>
++
+ #include "argtable2.h"
+
+ /* local error codes */
+@@ -112,7 +114,7 @@ static void errorfn(struct arg_date *parent, FILE *fp, int errorcode, const char
+ char buff[200];
+
+ fprintf(fp,"illegal timestamp format \"%s\"\n",argval);
+- bzero(&tm,sizeof(tm));
++ memset(&tm, 0, sizeof(tm));
+ strptime("1999-12-31 23:59:59","%F %H:%M:%S",&tm);
+ strftime(buff, sizeof(buff), parent->format, &tm);
+ printf("correct format is \"%s\"\n", buff);
+diff --git a/src/arg_int.c b/src/arg_int.c
+index 29c20e5..bc10012 100644
+--- a/src/arg_int.c
++++ b/src/arg_int.c
+@@ -30,6 +30,7 @@ USA.
+
+ #include "argtable2.h"
+ #include <limits.h>
++#include <ctype.h>
+
+ /* local error codes */
+ enum {EMINCOUNT=1,EMAXCOUNT,EBADINT,EOVERFLOW};
+diff --git a/src/getopt.c b/src/getopt.c
+index b208529..b13acc6 100644
+--- a/src/getopt.c
++++ b/src/getopt.c
+@@ -47,6 +47,7 @@
+ #endif
+
+ #include <stdio.h>
++#include <string.h>
+
+ /* Comment out all this code if we are using the GNU C Library, and are not
+ actually compiling the library itself. This code is part of the GNU C
+--
+2.24.3 (Apple Git-128)
+
diff --git a/ports/argtable2/CONTROL b/ports/argtable2/CONTROL
index 6cdb294cf..734b97342 100644
--- a/ports/argtable2/CONTROL
+++ b/ports/argtable2/CONTROL
@@ -1,4 +1,5 @@
Source: argtable2
-Version: 2.13-7
+Version: 2.13
+Port-Version: 8
Homepage: http://argtable.sourceforge.net
Description: Argtable is an ANSI C library for parsing GNU style command line options with a minimum of fuss.
diff --git a/ports/argtable2/portfile.cmake b/ports/argtable2/portfile.cmake
index 05f3f015c..cf394f65a 100644
--- a/ports/argtable2/portfile.cmake
+++ b/ports/argtable2/portfile.cmake
@@ -6,7 +6,9 @@ vcpkg_from_sourceforge(
REF argtable-2.13
FILENAME "argtable2-13.tar.gz"
SHA512 3d8303f3ba529e3241d918c0127a16402ece951efb964d14a06a3a7d29a252812ad3c44e96da28798871e9923e73a2cfe7ebc84139c1397817d632cae25c4585
- PATCHES fix-install-dirs.patch
+ PATCHES
+ 0001-fix-install-dirs.patch
+ 0002-include-correct-headers.patch
)
vcpkg_configure_cmake(