diff options
| -rw-r--r-- | etc/import/deps/pcre/TARGETS.git2 | 268 | ||||
| -rw-r--r-- | etc/import/include/git2/TARGETS.git2 | 218 |
2 files changed, 205 insertions, 281 deletions
diff --git a/etc/import/deps/pcre/TARGETS.git2 b/etc/import/deps/pcre/TARGETS.git2 index 88770e82..1f626dfc 100644 --- a/etc/import/deps/pcre/TARGETS.git2 +++ b/etc/import/deps/pcre/TARGETS.git2 @@ -1,183 +1,121 @@ { "config.h": - { "type": "file_gen" - , "arguments_config": ["OS"] - , "name": "config.h" - , "data": + { "type": "configure" + , "target": "config_header" + , "config": { "type": "let*" , "bindings": - [ [ "OS" - , { "type": "var" - , "name": "OS" - , "default": - {"type": "fail", "msg": "Required variable 'OS' is not set."} - } - ] - , ["SUPPORT_PCRE8", 1] + [ ["SUPPORT_PCRE8", true] + , ["BSR_ANYCRLF", false] + , ["NO_RECURSE", true] , ["PCRE_LINK_SIZE", "2"] , ["PCRE_PARENS_NEST_LIMIT", "250"] , ["PCRE_MATCH_LIMIT", "10000000"] , ["PCRE_MATCH_LIMIT_RECURSION", "MATCH_LIMIT"] , ["PCRE_NEWLINE", "LF"] - , ["NO_RECURSE", 1] , ["PCRE_POSIX_MALLOC_THRESHOLD", "10"] - , ["BSR_ANYCRLF", 0] - ] - , "body": - { "type": "join" - , "separator": "\n" - , "$1": - { "type": "++" - , "$1": - [ ["#define HAVE_STDINT_H 1", "#define HAVE_INTTYPES_H 1"] - , { "type": "case" - , "expr": {"type": "var", "name": "OS"} - , "case": {"windows": ["#define HAVE_WINDOWS_H 1"]} - , "default": - [ "#define HAVE_UNISTD_H 1" - , "#define HAVE_DIRENT_H 1" - , "#define HAVE_SYS_STAT_H 1" - , "#define HAVE_SYS_TYPES_H 1" - ] - } - , [ "#define HAVE_MEMMOVE_H 1" - , "#define HAVE_STRERROR_H 1" - , "#define HAVE_STRTOLL_H 1" - ] - , { "type": "case" - , "expr": {"type": "var", "name": "OS"} - , "case": {"windows": ["#define HAVE__STRTOI64_H 1"]} - , "default": ["#define HAVE_BCOPY_H 1", "#define HAVE_STRTOQ_H 1"] - } - , ["#define HAVE_LONG_LONG 1", "#define HAVE_UNSIGNED_LONG_LONG 1"] - , { "type": "if" - , "cond": {"type": "var", "name": "PCRE_STATIC"} - , "then": ["#define PCRE_STATIC 1"] - } - , { "type": "if" - , "cond": {"type": "var", "name": "SUPPORT_PCRE8"} - , "then": ["#define SUPPORT_PCRE8 1"] - } - , { "type": "if" - , "cond": {"type": "var", "name": "SUPPORT_PCRE16"} - , "then": ["#define SUPPORT_PCRE16 1"] - } - , { "type": "if" - , "cond": {"type": "var", "name": "SUPPORT_PCRE32"} - , "then": ["#define SUPPORT_PCRE32 1"] - } - , { "type": "if" - , "cond": {"type": "var", "name": "SUPPORT_JIT"} - , "then": ["#define SUPPORT_JIT 1"] - } - , { "type": "if" - , "cond": {"type": "var", "name": "SUPPORT_PCREGREP_JIT"} - , "then": ["#define SUPPORT_PCREGREP_JIT 1"] - } - , { "type": "if" - , "cond": {"type": "var", "name": "SUPPORT_UTF"} - , "then": ["#define SUPPORT_UTF 1"] - } - , { "type": "if" - , "cond": {"type": "var", "name": "SUPPORT_UCP"} - , "then": ["#define SUPPORT_UCP 1"] - } - , { "type": "if" - , "cond": {"type": "var", "name": "EBCDIC"} - , "then": ["#define EBCDIC 1"] - } - , { "type": "if" - , "cond": {"type": "var", "name": "EBCDIC_NL25"} - , "then": ["#define EBCDIC_NL25 1"] - } - , { "type": "if" - , "cond": {"type": "var", "name": "BSR_ANYCRLF"} - , "then": ["#define BSR_ANYCRLF 1"] - } - , { "type": "if" - , "cond": {"type": "var", "name": "NO_RECURSE"} - , "then": ["#define NO_RECURSE 1"] - } - , { "type": "if" - , "cond": {"type": "var", "name": "SUPPORT_LIBBZ2"} - , "then": ["#define SUPPORT_LIBBZ2 1"] - } - , { "type": "if" - , "cond": {"type": "var", "name": "SUPPORT_LIBZ"} - , "then": ["#define SUPPORT_LIBZ 1"] - } - , { "type": "if" - , "cond": {"type": "var", "name": "SUPPORT_LIBEDIT"} - , "then": ["#define SUPPORT_LIBEDIT 1"] - } - , { "type": "if" - , "cond": {"type": "var", "name": "SUPPORT_LIBREADLINE"} - , "then": ["#define SUPPORT_LIBREADLINE 1"] - } - , { "type": "if" - , "cond": {"type": "var", "name": "SUPPORT_VALGRIND"} - , "then": ["#define SUPPORT_VALGRIND 1"] - } - , { "type": "if" - , "cond": {"type": "var", "name": "SUPPORT_GCOV"} - , "then": ["#define SUPPORT_GCOV 1"] - } - , { "type": "case" - , "expr": {"type": "var", "name": "PCRE_NEWLINE"} - , "case": - { "LF": ["#define NEWLINE 10"] - , "CR": ["#define NEWLINE 13"] - , "CRLF": ["#define NEWLINE 3338"] - , "ANY": ["#define NEWLINE -1"] - , "ANYCRLF": ["#define NEWLINE -2"] - } - , "default": - { "type": "fail" - , "msg": "Unsupported value of PCRE_NEWLINE variable" - } - } - , [ { "type": "join" - , "$1": - [ "#define POSIX_MALLOC_THRESHOLD " - , {"type": "var", "name": "PCRE_POSIX_MALLOC_THRESHOLD"} - ] - } - , { "type": "join" - , "$1": - [ "#define LINK_SIZE " - , {"type": "var", "name": "PCRE_LINK_SIZE"} - ] - } - , { "type": "join" - , "$1": - [ "#define PARENS_NEST_LIMIT " - , {"type": "var", "name": "PCRE_PARENS_NEST_LIMIT"} - ] - } - , { "type": "join" - , "$1": - [ "#define MATCH_LIMIT " - , {"type": "var", "name": "PCRE_MATCH_LIMIT"} - ] - } - , { "type": "join" - , "$1": - [ "#define MATCH_LIMIT_RECURSION " - , {"type": "var", "name": "PCRE_MATCH_LIMIT_RECURSION"} - ] - } - , { "type": "join" - , "$1": - [ "#define PCREGREP_BUFSIZE " - , {"type": "var", "name": "PCREGREP_BUFSIZE", "default": ""} - ] + , ["sys_hdrs", ["stdlib.h", "string.h", "strings.h"]] + , [ "defines" + , [ ["MAX_NAME_SIZE", "32"] + , ["MAX_NAME_COUNT", "10000"] + , [ "NEWLINE" + , { "type": "case" + , "expr": {"type": "var", "name": "PCRE_NEWLINE"} + , "case": + { "LF": "10" + , "CR": "13" + , "CRLF": "3338" + , "ANY": "-1" + , "ANYCRLF": "-2" + } + , "default": + { "type": "fail" + , "msg": + [ "The PCRE_NEWLINE variable must be set to one of the following values:" + , ["LF", "CR", "CRLF", "ANY", "ANYCRLF"] + ] + } } ] - , ["#define MAX_NAME_SIZE 32", "#define MAX_NAME_COUNT 10000"] + , [ "POSIX_MALLOC_THRESHOLD" + , {"type": "var", "name": "PCRE_POSIX_MALLOC_THRESHOLD"} + ] + , ["LINK_SIZE", {"type": "var", "name": "PCRE_LINK_SIZE"}] + , [ "PARENS_NEST_LIMIT" + , {"type": "var", "name": "PCRE_PARENS_NEST_LIMIT"} + ] + , ["MATCH_LIMIT", {"type": "var", "name": "PCRE_MATCH_LIMIT"}] + , [ "MATCH_LIMIT_RECURSION" + , {"type": "var", "name": "PCRE_MATCH_LIMIT_RECURSION"} + ] + , [ "PCREGREP_BUFSIZE" + , {"type": "var", "name": "PCREGREP_BUFSIZE", "default": ""} + ] ] - } + ] + , [ "defines1" + , [ ["PCRE_STATIC", {"type": "var", "name": "PCRE_STATIC"}] + , ["SUPPORT_PCRE8", {"type": "var", "name": "SUPPORT_PCRE8"}] + , ["SUPPORT_PCRE16", {"type": "var", "name": "SUPPORT_PCRE16"}] + , ["SUPPORT_PCRE32", {"type": "var", "name": "SUPPORT_PCRE32"}] + , ["SUPPORT_JIT", {"type": "var", "name": "SUPPORT_JIT"}] + , [ "SUPPORT_PCREGREP_JIT" + , {"type": "var", "name": "SUPPORT_PCREGREP_JIT"} + ] + , ["SUPPORT_UTF", {"type": "var", "name": "SUPPORT_UTF"}] + , ["SUPPORT_UCP", {"type": "var", "name": "SUPPORT_UCP"}] + , ["EBCDIC", {"type": "var", "name": "EBCDIC"}] + , ["EBCDIC_NL25", {"type": "var", "name": "EBCDIC_NL25"}] + , ["BSR_ANYCRLF", {"type": "var", "name": "BSR_ANYCRLF"}] + , ["NO_RECURSE", {"type": "var", "name": "NO_RECURSE"}] + , ["SUPPORT_LIBBZ2", {"type": "var", "name": "SUPPORT_LIBBZ2"}] + , ["SUPPORT_LIBZ", {"type": "var", "name": "SUPPORT_LIBZ"}] + , ["SUPPORT_LIBEDIT", {"type": "var", "name": "SUPPORT_LIBEDIT"}] + , [ "SUPPORT_LIBREADLINE" + , {"type": "var", "name": "SUPPORT_LIBREADLINE"} + ] + , ["SUPPORT_VALGRIND", {"type": "var", "name": "SUPPORT_VALGRIND"}] + , ["SUPPORT_GCOV", {"type": "var", "name": "SUPPORT_GCOV"}] + ] + ] + , [ "have_cfile" + , [ ["HAVE_DIRENT_H", "dirent.h"] + , ["HAVE_STDINT_H", "stdint.h"] + , ["HAVE_INTTYPES_H", "inttypes.h"] + , ["HAVE_SYS_STAT_H", "sys/stat.h"] + , ["HAVE_SYS_TYPES_H", "sys/types.h"] + , ["HAVE_UNISTD_H", "unistd.h"] + , ["HAVE_WINDOWS_H", "windows.h"] + ] + ] + , [ "have_ctype" + , [ ["HAVE_LONG_LONG", "long long"] + , ["HAVE_UNSIGNED_LONG_LONG", "unsigned long long"] + ] + ] + , [ "have_csymbol" + , [ ["HAVE_BCOPY", ["bcopy", {"type": "var", "name": "sys_hdrs"}]] + , ["HAVE_MEMMOVE", ["memmove", {"type": "var", "name": "sys_hdrs"}]] + , ["HAVE_STRERROR", ["bcopy", {"type": "var", "name": "sys_hdrs"}]] + , ["HAVE_STRTOLL", ["strtoll", {"type": "var", "name": "sys_hdrs"}]] + , ["HAVE_STRTOQ", ["strtoq", {"type": "var", "name": "sys_hdrs"}]] + , [ "HAVE__STRTOI64" + , ["_strtoi64", {"type": "var", "name": "sys_hdrs"}] + ] + ] + ] + ] + , "body": + { "type": "env" + , "vars": + ["defines", "defines1", "have_cfile", "have_ctype", "have_csymbol"] } } } +, "config_header": + { "type": ["@", "rules", "CC/auto", "config"] + , "name": ["config.h"] + , "guard": ["INCLUDE_DEPS_PCRE_CONFIG_H"] + } , "git2_pcre": { "type": ["@", "rules", "CC", "library"] , "arguments_config": ["OS"] diff --git a/etc/import/include/git2/TARGETS.git2 b/etc/import/include/git2/TARGETS.git2 index 86f68807..8f3484e9 100644 --- a/etc/import/include/git2/TARGETS.git2 +++ b/etc/import/include/git2/TARGETS.git2 @@ -1,151 +1,137 @@ { "sys/features.h": - { "type": "file_gen" + { "type": "configure" , "arguments_config": [ "OS" - , "ARCH" , "TARGET_ARCH" , "DEBUG_POOL" , "ENABLE_TRACE" , "THREADSAFE" + , "REGEX_BACKEND" , "USE_ICONV" , "USE_NSEC" - , "REGEX_BACKEND" , "USE_SSH" , "USE_NTLMCLIENT" , "USE_GSSAPI" , "USE_SHA1" , "USE_HTTPS" - , "WINHTTP" ] - , "name": "sys/features.h" - , "data": - { "type": "join" - , "separator": "\n" - , "$1": - { "type": "++" - , "$1": - [ ["#ifndef INCLUDE_features_h__", "#define INCLUDE_features_h__", ""] - , { "type": "if" - , "cond": {"type": "var", "name": "DEBUG_POOL"} - , "then": ["#define GIT_DEBUG_POOL 1"] - } - , { "type": "if" - , "cond": {"type": "var", "name": "ENABLE_TRACE"} - , "then": ["#define GIT_TRACE 1"] - } - , { "type": "if" - , "cond": {"type": "var", "name": "THREADSAFE"} - , "then": ["#define GIT_THREADS 1"] - } + , "target": "feature_header" + , "config": + { "type": "let*" + , "bindings": + [ [ "IS_BSD" , { "type": "case" - , "expr": - { "type": "var" - , "name": "TARGET_ARCH" - , "default": {"type": "var", "name": "ARCH"} - } - , "case": - { "x86_64": ["#define GIT_ARCH_64 1"] - , "arm64": ["#define GIT_ARCH_64 1"] - } - , "default": ["#define GIT_ARCH_32 1"] + , "expr": {"type": "var", "name": "OS"} + , "case": {"darwin": true, "bsd": true} } - , { "type": "if" - , "cond": {"type": "var", "name": "USE_ICONV"} - , "then": ["#define GIT_USE_ICONV 1"] + ] + , [ "IS_32BIT" + , { "type": "case" + , "expr": {"type": "var", "name": "TARGET_ARCH"} + , "case": {"x86": true, "arm": true} } - , { "type": "if" - , "cond": {"type": "var", "name": "USE_NSEC"} - , "then": - { "type": "++" - , "$1": - [ [ "#define GIT_USE_NSEC 1" - , "#define GIT_USE_FUTIMENS 1" - , "#define GIT_USE_STAT_MTIME_NSEC 1" - ] - , { "type": "case*" - , "expr": {"type": "var", "name": "OS"} - , "case": - { "darwin": ["#define GIT_USE_STAT_MTIMESPEC 1"] - , "bsd": ["#define GIT_USE_STAT_MTIMESPEC 1"] - } - , "default": ["#define GIT_USE_STAT_MTIM 1"] + ] + , [ "defines1" + , { "type": "++" + , "$1": + [ [ ["GIT_DEBUG_POOL", {"type": "var", "name": "DEBUG_POOL"}] + , ["GIT_TRACE", {"type": "var", "name": "ENABLE_TRACE"}] + , ["GIT_THREADS", {"type": "var", "name": "THREADSAFE"}] + , { "type": "if" + , "cond": {"type": "var", "name": "IS_32BIT"} + , "then": ["GIT_ARCH_32", 1] + , "else": ["GIT_ARCH_64", 1] } + , ["GIT_USE_ICONV", {"type": "var", "name": "USE_ICONV"}] + , ["GIT_SSH", {"type": "var", "name": "USE_SSH"}] + , [ "GIT_SSH_MEMORY_CREDENTIALS" + , {"type": "var", "name": "USE_SSH"} + ] + , ["GIT_NTLM", {"type": "var", "name": "USE_NTLMCLIENT"}] ] - } - } - , { "type": "case*" - , "expr": {"type": "var", "name": "REGEX_BACKEND"} - , "case": - [ ["regcomp_l", ["#define GIT_REGEX_REGCOMP_L 1"]] - , ["regcomp", ["#define GIT_REGEX_REGCOMP 1"]] - , ["pcre", ["#define GIT_REGEX_PCRE 1"]] - , ["pcre2", ["#define GIT_REGEX_PCRE2 1"]] - , ["builtin", ["#define GIT_REGEX_BUILTIN 1"]] - , [null, ["#define GIT_REGEX_BUILTIN 1"]] - ] - , "default": - { "type": "fail" - , "msg": "The REGEX_BACKEND option provided is not supported" - } - } - , { "type": "if" - , "cond": {"type": "var", "name": "USE_SSH"} - , "then": - ["#define GIT_SSH 1", "#define GIT_SSH_MEMORY_CREDENTIALS 1"] - } - , { "type": "if" - , "cond": {"type": "var", "name": "USE_NTLMCLIENT"} - , "then": ["#define GIT_NTLM 1"] - } - , { "type": "case*" - , "expr": {"type": "var", "name": "USE_GSSAPI"} - , "case": - [ ["GSS.framework", ["#define GIT_GSSFRAMEWORK 1"]] - , ["gssapi", ["#define GIT_GSSAPI 1"]] - , [false, []] - ] - , "default": - { "type": "fail" - , "msg": "Backend asked for in USE_GSSAPI is not supported" - } - } - , { "type": "if" - , "cond": {"type": "var", "name": "USE_HTTPS"} - , "then": - { "type": "++" - , "$1": - [ ["#define GIT_HTTPS 1"] - , { "type": "case*" - , "expr": {"type": "var", "name": "USE_HTTPS"} + , { "type": "if" + , "cond": {"type": "var", "name": "USE_NSEC"} + , "then": + [ ["GIT_USE_NSEC", 1] + , ["GIT_USE_FUTIMENS", 1] + , ["GIT_USE_STAT_MTIME_NSEC", 1] + , { "type": "if" + , "cond": {"type": "var", "name": "IS_BSD"} + , "then": ["GIT_USE_STAT_MTIMESPEC", 1] + , "else": ["GIT_USE_STAT_MTIM", 1] + } + ] + } + , [ { "type": "case*" + , "expr": {"type": "var", "name": "REGEX_BACKEND"} , "case": - [ ["SecureTransport", ["#define GIT_SECURE_TRANSPORT 1"]] - , ["OpenSSL", ["#define GIT_OPENSSL 1"]] - , ["mbedTLS", ["#define GIT_MBEDTLS 1"]] - , ["WinHTTP", ["#define GIT_WINHTTP 1"]] + [ ["regcomp_l", ["GIT_REGEX_REGCOMP_L", 1]] + , ["regcomp", ["GIT_REGEX_REGCOMP", 1]] + , ["pcre", ["GIT_REGEX_PCRE", 1]] + , ["pcre2", ["GIT_REGEX_PCRE2", 1]] + , ["builtin", ["GIT_REGEX_BUILTIN", 1]] + , [null, ["GIT_REGEX_BUILTIN", 1]] ] , "default": { "type": "fail" - , "msg": "Backend asked for in USE_HTTPS is not supported" + , "msg": "The REGEX_BACKEND option provided is not supported" } } ] - } - } - , { "type": "case*" - , "expr": {"type": "var", "name": "USE_SHA1"} - , "case": - [ ["CollisionDetection", ["#define GIT_SHA1_COLLISIONDETECT 1"]] - , ["Win32", ["#define GIT_SHA1_WIN32 1"]] - , ["CommonCrypto", ["#define GIT_SHA1_COMMON_CRYPTO 1"]] - , ["OpenSSL", ["#define GIT_SHA1_OPENSSL 1"]] - , ["mbedTLS", ["#define GIT_SHA1_MBEDTLS 1"]] + , { "type": "case*" + , "expr": {"type": "var", "name": "USE_GSSAPI"} + , "case": + [ ["GSS.framework", [["GIT_GSSFRAMEWORK", 1]]] + , ["gssapi", [["GIT_GSSAPI", 1]]] + , [false, []] + ] + , "default": + { "type": "fail" + , "msg": "Backend asked for in USE_GSSAPI is not supported" + } + } + , { "type": "if" + , "cond": {"type": "var", "name": "USE_HTTPS"} + , "then": + [ ["GIT_HTTPS", 1] + , { "type": "case*" + , "expr": {"type": "var", "name": "USE_HTTPS"} + , "case": + [ ["SecureTransport", ["GIT_SECURE_TRANSPORT", 1]] + , ["OpenSSL", ["GIT_OPENSSL", 1]] + , ["mbedTLS", ["GIT_MBEDTLS", 1]] + , ["WinHTTP", ["GIT_WINHTTP", 1]] + ] + , "default": + { "type": "fail" + , "msg": "Backend asked for in USE_HTTPS is not supported" + } + } + ] + } + , { "type": "case*" + , "expr": {"type": "var", "name": "USE_SHA1"} + , "case": + [ ["CollisionDetection", [["GIT_SHA1_COLLISIONDETECT", 1]]] + , ["Win32", [["GIT_SHA1_WIN32", 1]]] + , ["CommonCrypto", [["GIT_SHA1_COMMON_CRYPTO", 1]]] + , ["OpenSSL", [["GIT_SHA1_OPENSSL", 1]]] + , ["mbedTLS", [["GIT_SHA1_MBEDTLS", 1]]] + ] + } ] } - , ["", "#endif", ""] ] - } + ] + , "body": {"type": "env", "vars": ["defines1"]} } } +, "feature_header": + { "type": ["@", "rules", "CC/auto", "config"] + , "name": ["features.h"] + , "guard": ["INCLUDE_features_h__"] + , "stage": ["sys"] + } , "sys/repository.h": { "type": ["@", "rules", "patch", "file"] , "src": [["FILE", null, "sys/repository.h"]] |