From 81af78b4e96f278746db6fbe33db4712e326ab5e Mon Sep 17 00:00:00 2001 From: Oliver Reiche Date: Fri, 21 Apr 2023 17:43:48 +0200 Subject: imports: Support pkg-config for curl/archive/ares/zlib ... and align lib names to commonly used pkg names. --- etc/import.pkgconfig/TARGETS.archive | 5 +++++ etc/import.pkgconfig/TARGETS.cares | 5 +++++ etc/import.pkgconfig/TARGETS.curl | 5 +++++ etc/import.pkgconfig/TARGETS.zlib | 3 +++ etc/import/TARGETS.cares | 2 +- etc/import/lib/TARGETS.curl | 2 +- etc/import/libarchive/TARGETS.archive | 2 +- 7 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 etc/import.pkgconfig/TARGETS.archive create mode 100644 etc/import.pkgconfig/TARGETS.cares create mode 100644 etc/import.pkgconfig/TARGETS.curl create mode 100644 etc/import.pkgconfig/TARGETS.zlib diff --git a/etc/import.pkgconfig/TARGETS.archive b/etc/import.pkgconfig/TARGETS.archive new file mode 100644 index 00000000..64dc830b --- /dev/null +++ b/etc/import.pkgconfig/TARGETS.archive @@ -0,0 +1,5 @@ +{ "archive": + { "type": ["@", "rules", "CC/pkgconfig", "system_library"] + , "name": ["libarchive"] + } +} diff --git a/etc/import.pkgconfig/TARGETS.cares b/etc/import.pkgconfig/TARGETS.cares new file mode 100644 index 00000000..b57f6c74 --- /dev/null +++ b/etc/import.pkgconfig/TARGETS.cares @@ -0,0 +1,5 @@ +{ "ares": + { "type": ["@", "rules", "CC/pkgconfig", "system_library"] + , "name": ["libcares"] + } +} diff --git a/etc/import.pkgconfig/TARGETS.curl b/etc/import.pkgconfig/TARGETS.curl new file mode 100644 index 00000000..217e78dd --- /dev/null +++ b/etc/import.pkgconfig/TARGETS.curl @@ -0,0 +1,5 @@ +{ "curl": + { "type": ["@", "rules", "CC/pkgconfig", "system_library"] + , "name": ["libcurl"] + } +} diff --git a/etc/import.pkgconfig/TARGETS.zlib b/etc/import.pkgconfig/TARGETS.zlib new file mode 100644 index 00000000..26eff1c6 --- /dev/null +++ b/etc/import.pkgconfig/TARGETS.zlib @@ -0,0 +1,3 @@ +{ "zlib": + {"type": ["@", "rules", "CC/pkgconfig", "system_library"], "name": ["zlib"]} +} diff --git a/etc/import/TARGETS.cares b/etc/import/TARGETS.cares index 6115e860..d361a780 100644 --- a/etc/import/TARGETS.cares +++ b/etc/import/TARGETS.cares @@ -17,7 +17,7 @@ } , "ares_lib": { "type": ["@", "rules", "CC", "library"] - , "name": ["ares"] + , "name": ["libcares"] , "pure C": ["YES"] , "private-defines": ["_GNU_SOURCE", "_HAS_EXCEPTIONS=0", "HAVE_CONFIG_H", "CARES_STATICLIB"] diff --git a/etc/import/lib/TARGETS.curl b/etc/import/lib/TARGETS.curl index 1c93c50d..f26139c6 100644 --- a/etc/import/lib/TARGETS.curl +++ b/etc/import/lib/TARGETS.curl @@ -1058,7 +1058,7 @@ {"type": ["@", "rules", "data", "staged"], "srcs": ["vssh/ssh.h"]} , "libcurl": { "type": ["@", "rules", "CC", "library"] - , "name": ["curl"] + , "name": ["libcurl"] , "pure C": ["yes"] , "srcs": [ "libcurl_csources" diff --git a/etc/import/libarchive/TARGETS.archive b/etc/import/libarchive/TARGETS.archive index 247d6a0d..cc4de4f2 100644 --- a/etc/import/libarchive/TARGETS.archive +++ b/etc/import/libarchive/TARGETS.archive @@ -1579,7 +1579,7 @@ } , "libarchive": { "type": ["@", "rules", "CC", "library"] - , "name": ["archive"] + , "name": ["libarchive"] , "pure C": ["yes"] , "srcs": ["libarchive_csources"] , "hdrs": ["libarchive_public_hheaders"] -- cgit v1.2.3