summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TARGETS2
-rw-r--r--etc/defaults/CC/TARGETS.archive4
-rw-r--r--etc/import/TARGETS.archive23
-rw-r--r--etc/import/libarchive/TARGETS.archive23
-rw-r--r--etc/import/src/TARGETS.archive48
-rw-r--r--etc/repos.json10
6 files changed, 103 insertions, 7 deletions
diff --git a/TARGETS b/TARGETS
index 9e8d2f82..dc5f0817 100644
--- a/TARGETS
+++ b/TARGETS
@@ -245,6 +245,7 @@
, ["ENABLE_LIBXML2", false]
, ["ENABLE_EXPAT", false]
, ["ENABLE_PCREPOSIX", false]
+ , ["ENABLE_PCRE2POSIX", false]
, ["ENABLE_LIBGCC", false]
, ["ENABLE_CNG", false]
, ["XATTR_PROVIDER", "gnu"]
@@ -260,6 +261,7 @@
, "ENABLE_LIBXML2"
, "ENABLE_EXPAT"
, "ENABLE_PCREPOSIX"
+ , "ENABLE_PCRE2POSIX"
, "ENABLE_LIBGCC"
, "ENABLE_CNG"
, "XATTR_PROVIDER"
diff --git a/etc/defaults/CC/TARGETS.archive b/etc/defaults/CC/TARGETS.archive
index 1aa19fb6..41b7ef47 100644
--- a/etc/defaults/CC/TARGETS.archive
+++ b/etc/defaults/CC/TARGETS.archive
@@ -56,6 +56,10 @@
}
}
, { "type": "case*"
+ , "expr": {"type": "var", "name": "OS"}
+ , "case": [["darwin", ["-ffunction-sections -fdata-sections"]]]
+ }
+ , { "type": "case*"
, "expr": {"type": "var", "name": "COMPILER_FAMILY"}
, "case":
[ [ "xlc_r"
diff --git a/etc/import/TARGETS.archive b/etc/import/TARGETS.archive
index 3b1cc98c..a17d16a1 100644
--- a/etc/import/TARGETS.archive
+++ b/etc/import/TARGETS.archive
@@ -30,6 +30,7 @@
, "ENABLE_LIBXML2"
, "ENABLE_EXPAT"
, "ENABLE_PCREPOSIX"
+ , "ENABLE_PCRE2POSIX"
, "ENABLE_LIBGCC"
, "ENABLE_CNG"
, "ENABLE_XATTR"
@@ -37,6 +38,7 @@
, "ENABLE_ICONV"
, "ENABLE_LIBMD"
, "ENABLE_PCRE"
+ , "ENABLE_PCRE2"
, "ENABLE_REGEX"
, "XATTR_PROVIDER"
, "ENABLE_RICHACL"
@@ -72,6 +74,7 @@
]
, "ENABLE_LIBXML2":
[ "Boolean. Default value: true. Link against libxml2 (system or open name)."
+ , "Value used only if ENABLE_ICONV==true."
]
, "ENABLE_EXPAT":
[ "Boolean. Default value: true. Link against EXPAT (system or open name)."
@@ -79,6 +82,9 @@
, "ENABLE_PCREPOSIX":
[ "Boolean. Default value: true. Link against PCREPOSIX (system or open name)."
]
+ , "ENABLE_PCRE2POSIX":
+ [ "Boolean. Default value: true. Link against PCRE2POSIX (system or open name)."
+ ]
, "ENABLE_LIBGCC":
[ "Boolean. Default value: true. Link against LIBGCC (system or open name)."
]
@@ -96,6 +102,7 @@
, "Disabled if ~ENABLE_OPENSSL==true~."
]
, "ENABLE_PCRE": ["Boolean. Link against pcre (system or open name)."]
+ , "ENABLE_PCRE2": ["Boolean. Link against pcre2 (system or open name)."]
, "ENABLE_REGEX": ["Boolean. Link against regex (system or open name)."]
, "XATTR_PROVIDER":
[ "\"attr\": Link against attr (system or open name) for xattr support."
@@ -137,6 +144,7 @@
, "ENABLE_LIBXML2"
, "ENABLE_EXPAT"
, "ENABLE_PCREPOSIX"
+ , "ENABLE_PCRE2POSIX"
, "ENABLE_LIBGCC"
, "ENABLE_CNG"
, "ENABLE_XATTR"
@@ -144,6 +152,7 @@
, "ENABLE_ICONV"
, "ENABLE_LIBMD"
, "ENABLE_PCRE"
+ , "ENABLE_PCRE2"
, "ENABLE_REGEX"
, "XATTR_PROVIDER"
, "ENABLE_RICHACL"
@@ -234,7 +243,11 @@
, {"type": "var", "name": "ENABLE_BZip2", "default": true}
]
, [ "ENABLE_LIBXML2"
- , {"type": "var", "name": "ENABLE_LIBXML2", "default": true}
+ , { "type": "case*"
+ , "expr": {"type": "var", "name": "ENABLE_LIBXML2"}
+ , "case": [[true, {"type": "var", "name": "ENABLE_ICONV"}]]
+ , "default": {"type": "var", "name": "ENABLE_ICONV"}
+ }
]
, [ "ENABLE_EXPAT"
, { "type": "case*"
@@ -259,6 +272,9 @@
, [ "ENABLE_PCREPOSIX"
, {"type": "var", "name": "ENABLE_PCREPOSIX", "default": true}
]
+ , [ "ENABLE_PCRE2POSIX"
+ , {"type": "var", "name": "ENABLE_PCREPOSIX", "default": true}
+ ]
, [ "ENABLE_LIBGCC"
, {"type": "var", "name": "ENABLE_LIBGCC", "default": true}
]
@@ -305,6 +321,9 @@
, [ "ENABLE_PCRE"
, {"type": "var", "name": "ENABLE_PCRE", "default": false}
]
+ , [ "ENABLE_PCRE2"
+ , {"type": "var", "name": "ENABLE_PCRE2", "default": false}
+ ]
, [ "ENABLE_REGEX"
, {"type": "var", "name": "ENABLE_REGEX", "default": false}
]
@@ -352,6 +371,7 @@
, "ENABLE_LIBXML2"
, "ENABLE_EXPAT"
, "ENABLE_PCREPOSIX"
+ , "ENABLE_PCRE2POSIX"
, "ENABLE_LIBGCC"
, "ENABLE_CNG"
, "ENABLE_XATTR"
@@ -359,6 +379,7 @@
, "ENABLE_ICONV"
, "ENABLE_LIBMD"
, "ENABLE_PCRE"
+ , "ENABLE_PCRE2"
, "ENABLE_REGEX"
, "XATTR_PROVIDER"
, "ENABLE_RICHACL"
diff --git a/etc/import/libarchive/TARGETS.archive b/etc/import/libarchive/TARGETS.archive
index 7297edef..35a373f8 100644
--- a/etc/import/libarchive/TARGETS.archive
+++ b/etc/import/libarchive/TARGETS.archive
@@ -18,6 +18,7 @@
, "ENABLE_LIBXML2"
, "ENABLE_EXPAT"
, "ENABLE_PCREPOSIX"
+ , "ENABLE_PCRE2POSIX"
, "ENABLE_LIBGCC"
, "ENABLE_CNG"
, "ENABLE_XATTR"
@@ -25,6 +26,7 @@
, "ENABLE_ICONV"
, "ENABLE_LIBMD"
, "ENABLE_PCRE"
+ , "ENABLE_PCRE2"
, "ENABLE_REGEX"
, "XATTR_PROVIDER"
, "ENABLE_RICHACL"
@@ -82,6 +84,8 @@
, "membership.h"
, "memory.h"
, "paths.h"
+ , "pcreposix.h"
+ , "pcre2posix.h"
, "poll.h"
, "process.h"
, "pthread.h"
@@ -176,7 +180,11 @@
, [ "HAVE_LIBPCREPOSIX"
, {"type": "var", "name": "ENABLE_PCREPOSIX"}
]
+ , [ "HAVE_LIBPCRE2POSIX"
+ , {"type": "var", "name": "ENABLE_PCRE2POSIX"}
+ ]
, ["HAVE_LIBPCRE", {"type": "var", "name": "ENABLE_PCRE"}]
+ , ["HAVE_LIBPCRE2", {"type": "var", "name": "ENABLE_PCRE2"}]
, ["HAVE_LIBGCC", {"type": "var", "name": "ENABLE_LIBGCC"}]
, ["HAVE_LIBACL", {"type": "var", "name": "ENABLE_ACL"}]
, ["HAVE_LIBRICHACL", {"type": "var", "name": "ENABLE_RICHACL"}]
@@ -365,6 +373,14 @@
, "then": [["HAVE_ZSTD_H", "zstd.h"]]
}
, { "type": "if"
+ , "cond": {"type": "var", "name": "ENABLE_PCREPOSIX"}
+ , "then": [["HAVE_PCREPOSIX_H", "pcreposix.h"]]
+ }
+ , { "type": "if"
+ , "cond": {"type": "var", "name": "ENABLE_PCRE2POSIX"}
+ , "then": [["HAVE_PCRE2POSIX_H", "pcre2posix.h"]]
+ }
+ , { "type": "if"
, "cond": {"type": "var", "name": "ENABLE_CNG"}
, "then": [["HAVE_BCRYPT_H", "bcrypt.h"]]
}
@@ -441,7 +457,7 @@
, "cond": {"type": "var", "name": "ENABLE_ZSTD"}
, "then":
[ ["HAVE_LIBZSTD", ["ZSTD_decompressStream", ["zstd.h"]]]
- , [ "HAVE_LIBZSTD_COMPRESSOR"
+ , [ "HAVE_LIBZSTD_compressStream"
, ["ZSTD_compressStream", ["zstd.h"]]
]
]
@@ -640,6 +656,9 @@
, [ "HAVE_SYMLINK"
, ["symlink", {"type": "var", "name": "sys_hdrs"}]
]
+ , [ "HAVE_SYSCONF"
+ , ["sysconf", {"type": "var", "name": "sys_hdrs"}]
+ ]
, [ "HAVE_TIMEGM"
, ["timegm", {"type": "var", "name": "sys_hdrs"}]
]
@@ -1427,7 +1446,9 @@
, ["src", "archive_crypto"]
, ["src", "archive_libxml2"]
, ["src", "archive_pcreposix"]
+ , ["src", "archive_pcre2posix"]
, ["src", "archive_pcre"]
+ , ["src", "archive_pcre2"]
, ["src", "archive_regex"]
, ["src", "archive_libgcc"]
, ["src", "archive_acl"]
diff --git a/etc/import/src/TARGETS.archive b/etc/import/src/TARGETS.archive
index a2ffdfa7..4562b2da 100644
--- a/etc/import/src/TARGETS.archive
+++ b/etc/import/src/TARGETS.archive
@@ -366,6 +366,30 @@
}
}
}
+, "archive_pcre2posix":
+ { "type": ["@", "rules", "CC", "library"]
+ , "arguments_config": ["USE_SYSTEM_LIBS", "ENABLE_PCRE2POSIX"]
+ , "name": ["archive_pcre2posix"]
+ , "private-ldflags":
+ { "type": "if"
+ , "cond": {"type": "var", "name": "ENABLE_PCRE2POSIX"}
+ , "then":
+ { "type": "if"
+ , "cond": {"type": "var", "name": "USE_SYSTEM_LIBS"}
+ , "then": ["-lpcre2posix"]
+ }
+ }
+ , "deps":
+ { "type": "if"
+ , "cond": {"type": "var", "name": "ENABLE_PCRE2POSIX"}
+ , "then":
+ { "type": "if"
+ , "cond": {"type": "var", "name": "USE_SYSTEM_LIBS"}
+ , "then": []
+ , "else": [["@", "pcre2posix", "", "pcre2posix"]]
+ }
+ }
+ }
, "archive_pcre":
{ "type": ["@", "rules", "CC", "library"]
, "arguments_config": ["USE_SYSTEM_LIBS", "ENABLE_PCRE"]
@@ -390,6 +414,30 @@
}
}
}
+, "archive_pcre2":
+ { "type": ["@", "rules", "CC", "library"]
+ , "arguments_config": ["USE_SYSTEM_LIBS", "ENABLE_PCRE2"]
+ , "name": ["archive_pcre2"]
+ , "private-ldflags":
+ { "type": "if"
+ , "cond": {"type": "var", "name": "ENABLE_PCRE2"}
+ , "then":
+ { "type": "if"
+ , "cond": {"type": "var", "name": "USE_SYSTEM_LIBS"}
+ , "then": ["-lpcre2"]
+ }
+ }
+ , "deps":
+ { "type": "if"
+ , "cond": {"type": "var", "name": "ENABLE_PCRE2"}
+ , "then":
+ { "type": "if"
+ , "cond": {"type": "var", "name": "USE_SYSTEM_LIBS"}
+ , "then": []
+ , "else": [["@", "pcre2", "", "pcre2"]]
+ }
+ }
+ }
, "archive_regex":
{ "type": ["@", "rules", "CC", "library"]
, "arguments_config": ["USE_SYSTEM_LIBS", "ENABLE_REGEX"]
diff --git a/etc/repos.json b/etc/repos.json
index fe706b2f..d339e874 100644
--- a/etc/repos.json
+++ b/etc/repos.json
@@ -471,11 +471,11 @@
, "com_github_libarchive_libarchive":
{ "repository":
{ "type": "archive"
- , "content": "1293bda3e94bc96d7f9eed01c94b2136477b402a"
- , "fetch": "https://github.com/libarchive/libarchive/releases/download/v3.7.2/libarchive-3.7.2.tar.gz"
- , "sha256": "df404eb7222cf30b4f8f93828677890a2986b66ff8bf39dac32a804e96ddf104"
- , "sha512": "1af253203df3014d1fbf3e99ebdc7aa2a3f036c7c2606d0f0550c49973b0fff99ee7262f4a6e20090c0806c40e964731334360daa3b718bde40108183eacc8a1"
- , "subdir": "libarchive-3.7.2"
+ , "content": "50abf77b7226df46a33013f278464c1588b0ceea"
+ , "fetch": "https://github.com/libarchive/libarchive/releases/download/v3.7.4/libarchive-3.7.4.tar.gz"
+ , "sha256": "7875d49596286055b52439ed42f044bd8ad426aa4cc5aabd96bfe7abb971d5e8"
+ , "sha512": "a37006350c2a61a35ecbe638c3168661bef5cbcb7dd3e5ec9a14af1a9aa89ec1be23902cdd17c60bf15859ba1e41bad8456dee9df686bc2d825b30d453cb2e44"
+ , "subdir": "libarchive-3.7.4"
}
, "target_root": "import targets"
, "target_file_name": "TARGETS.archive"
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-03 18:28:02 +0000