early-access version 2853
This commit is contained in:
86
externals/vcpkg/ports/libtasn1/msvc_fixes.patch
vendored
Executable file
86
externals/vcpkg/ports/libtasn1/msvc_fixes.patch
vendored
Executable file
@@ -0,0 +1,86 @@
|
||||
diff --git a/src/asn1Coding.c b/src/asn1Coding.c
|
||||
index 86c1d07..6fcfc4d 100644
|
||||
--- a/src/asn1Coding.c
|
||||
+++ b/src/asn1Coding.c
|
||||
@@ -23,7 +23,12 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
+#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
+#endif
|
||||
+#ifdef _MSC_VER
|
||||
+#include <io.h>
|
||||
+#endif
|
||||
#include <getopt.h>
|
||||
#include <assert.h>
|
||||
|
||||
diff --git a/src/asn1Decoding.c b/src/asn1Decoding.c
|
||||
index c6f192e..3e4e21d 100644
|
||||
--- a/src/asn1Decoding.c
|
||||
+++ b/src/asn1Decoding.c
|
||||
@@ -23,7 +23,12 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
+#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
+#endif
|
||||
+#ifdef _MSC_VER
|
||||
+#include <io.h>
|
||||
+#endif
|
||||
#include <getopt.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
diff --git a/src/asn1Parser.c b/src/asn1Parser.c
|
||||
index b6844a8..445c716 100644
|
||||
--- a/src/asn1Parser.c
|
||||
+++ b/src/asn1Parser.c
|
||||
@@ -23,7 +23,12 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
+#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
+#endif
|
||||
+#ifdef _MSC_VER
|
||||
+#include <io.h>
|
||||
+#endif
|
||||
#include <getopt.h>
|
||||
#include <assert.h>
|
||||
|
||||
diff --git a/src/benchmark.c b/src/benchmark.c
|
||||
index 010d58e..6c613df 100644
|
||||
--- a/src/benchmark.c
|
||||
+++ b/src/benchmark.c
|
||||
@@ -21,9 +21,16 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <signal.h>
|
||||
+#ifndef _MSC_VER
|
||||
#include <sys/time.h>
|
||||
+#endif
|
||||
#include <time.h>
|
||||
+#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
+#endif
|
||||
+#ifdef _MSC_VER
|
||||
+#include <io.h>
|
||||
+#endif
|
||||
#include "benchmark.h"
|
||||
|
||||
int benchmark_must_finish = 0;
|
||||
diff --git a/src/benchmark.h b/src/benchmark.h
|
||||
index 3272649..6b6bf32 100644
|
||||
--- a/src/benchmark.h
|
||||
+++ b/src/benchmark.h
|
||||
@@ -21,7 +21,9 @@
|
||||
# define BENCHMARK_H
|
||||
|
||||
#include <config.h>
|
||||
+#ifndef _MSC_VER
|
||||
#include <sys/time.h>
|
||||
+#endif
|
||||
#include <time.h>
|
||||
#include <signal.h>
|
||||
#if defined _WIN32
|
||||
52
externals/vcpkg/ports/libtasn1/portfile.cmake
vendored
Executable file
52
externals/vcpkg/ports/libtasn1/portfile.cmake
vendored
Executable file
@@ -0,0 +1,52 @@
|
||||
set(VERSION 4.17.0)
|
||||
|
||||
if(VCPKG_TARGET_IS_WINDOWS)
|
||||
set(PATCHES msvc_fixes.patch)
|
||||
endif()
|
||||
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://ftp.gnu.org/gnu/libtasn1/libtasn1-${VERSION}.tar.gz"
|
||||
FILENAME "libtasn1-${VERSION}.tar.gz"
|
||||
SHA512 9cbd920196d1e4c8f5aa613259cded2510d40edb583ce20cc2702e2dee9bf32bee85a159c74600ffbebc2af2787e28ed0fe0adf15fc46839283747f4fe166d3d
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
REF ${VERSION}
|
||||
PATCHES
|
||||
${PATCHES}
|
||||
)
|
||||
|
||||
set(EXTRA_OPTS "")
|
||||
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
|
||||
# $LIBS is an environment variable that vcpkg already pre-populated with some libraries.
|
||||
# We need to re-purpose it when passing LIBS option to make to avoid overriding the vcpkg's own list.
|
||||
list(APPEND EXTRA_OPTS "LIBS=-lgettimeofday -lgetopt \$LIBS")
|
||||
else()
|
||||
# restore the default ac_cv_prog_cc_g flags, otherwise it fails to compile
|
||||
set(VCPKG_C_FLAGS "-g -O2")
|
||||
set(VCPKG_CXX_FLAGS "-g -O2")
|
||||
endif()
|
||||
|
||||
# The upstream doesn't add this macro to the configure
|
||||
if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
list(APPEND EXTRA_OPTS "CFLAGS=\$CFLAGS -DASN1_STATIC")
|
||||
endif()
|
||||
|
||||
set(ENV{GTKDOCIZE} true)
|
||||
vcpkg_configure_make(
|
||||
AUTOCONFIG
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
OPTIONS
|
||||
--disable-doc
|
||||
--disable-gtk-doc
|
||||
--disable-gcc-warnings
|
||||
${EXTRA_OPTS}
|
||||
)
|
||||
|
||||
vcpkg_install_make()
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools" "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
18
externals/vcpkg/ports/libtasn1/vcpkg.json
vendored
Executable file
18
externals/vcpkg/ports/libtasn1/vcpkg.json
vendored
Executable file
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"name": "libtasn1",
|
||||
"version": "4.17.0",
|
||||
"port-version": 3,
|
||||
"description": "A secure communications library implementing the SSL, TLS and DTLS protocols",
|
||||
"homepage": "https://www.gnutls.org/",
|
||||
"supports": "!uwp",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "getopt",
|
||||
"platform": "windows & !mingw"
|
||||
},
|
||||
{
|
||||
"name": "gettimeofday",
|
||||
"platform": "windows & !mingw"
|
||||
}
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user